Fix in_fetch state not being reinitialized

Author: Girgias

ext/pdo/pdo_stmt.c

@@ -772,7 +772,7 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
 				 * See ext/pdo/tests/bug_38253.phpt */
 				if (UNEXPECTED(ce == NULL)) {
 					pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "No fetch class specified");
-					return false;
+					goto in_fetch_error;
 				}
 				ctor_arguments = stmt->fetch.cls.ctor_args;
 			}
@@ -781,7 +781,7 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
 				if (!ce->unserialize) {
 					/* As this option is deprecated we do not bother to mention the class name. */
 					pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "cannot unserialize class");
-					return false;
+					goto in_fetch_error;
 				}
 			} else {
 				if (UNEXPECTED(object_init_ex(return_value, ce) != SUCCESS)) {
@@ -791,7 +791,7 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
 					bool failed = pdo_call_fetch_object_constructor(ce->constructor, ctor_arguments, return_value);
 					if (UNEXPECTED(failed)) {
 						zval_ptr_dtor(return_value);
-						return false;
+						goto in_fetch_error;
 					}
 				}
 			}
@@ -803,7 +803,7 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
 			 * See ext/pdo/tests/bug_38253.phpt */
 			if (stmt->fetch.into == NULL) {
 				pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "No fetch-into object specified.");
-				return false;
+				goto in_fetch_error;
 			}
 
 			ZVAL_OBJ_COPY(return_value, stmt->fetch.into);
@@ -819,7 +819,7 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
 			 * See ext/pdo/tests/bug_38253.phpt */
 			if (UNEXPECTED(!ZEND_FCC_INITIALIZED(stmt->fetch.func.fcc))) {
 				pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "No fetch function specified");
-				return false;
+				goto in_fetch_error;
 			}
 			/* There will be at most stmt->column_count parameters.
 			 * However, if we fetch a group key we will have over allocated. */
@@ -849,7 +849,7 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
 		if (unserialize_res == FAILURE) {
 			pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "cannot unserialize class");
 			zval_ptr_dtor(return_value);
-			return false;
+			goto in_fetch_error;
 		}
 		column_index_to_fetch++;
 	}
@@ -929,7 +929,7 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
 		bool failed = pdo_call_fetch_object_constructor(ce->constructor, ctor_arguments, return_value);
 		if (UNEXPECTED(failed)) {
 			zval_ptr_dtor(return_value);
-			return false;
+			goto in_fetch_error;
 		}
 	} else if (how == PDO_FETCH_FUNC) {
 		zend_call_known_fcc(&stmt->fetch.func.fcc, return_value, fetch_function_param_num, fetch_function_params, NULL);
@@ -942,6 +942,10 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
 	stmt->in_fetch = false;
 
 	return true;
+
+	in_fetch_error:
+		stmt->in_fetch = false;
+		return false;
 }
 /* }}} */