ext/pdo_odbc: Do not populate message if there is no driver error

Author: Girgias

ext/pdo/tests/bug_38253.phpt

@@ -43,18 +43,18 @@ PDOTest::dropTableIfExists($db, "test38253");
 --EXPECTF--
 Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error: No fetch class specified in %s on line %d
 
-Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error%s on line %d
+Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error in %s on line %d
 array(0) {
 }
 
 Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error: No fetch function specified in %s on line %d
 
-Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error%s on line %d
+Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error in %s on line %d
 array(0) {
 }
 
 Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error: No fetch-into object specified. in %s on line %d
 
-Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error%s on line %d
+Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error in %s on line %d
 array(0) {
 }

ext/pdo_odbc/odbc_driver.c

@@ -41,10 +41,14 @@ static void pdo_odbc_fetch_error_func(pdo_dbh_t *dbh, pdo_stmt_t *stmt, zval *in
 		einfo = &S->einfo;
 	}
 
-	message = strpprintf(0, "%s (%s[%ld] at %s:%d)",
-				einfo->last_err_msg,
-				einfo->what, (long) einfo->last_error,
-				einfo->file, einfo->line);
+	if (einfo->last_err_msg != NULL) {
+		message = strpprintf(0, "%s (%s[%ld] at %s:%d)",
+					einfo->last_err_msg,
+					einfo->what, (long) einfo->last_error,
+					einfo->file, einfo->line);
+	} else {
+		message = ZSTR_EMPTY_ALLOC();
+	}
 
 	add_next_index_long(info, einfo->last_error);
 	add_next_index_str(info, message);