Merge branch 'PHP-8.1' into PHP-8.2

kamil-tekiela · kamil-tekiela · commit 7a4b213c1fbe · 2023-08-10T15:25:37.000+01:00
* PHP-8.1:
  Fix error checking in mysqlnd
diff --git a/NEWS b/NEWS
@@ -47,6 +47,8 @@ PHP                                                                        NEWS
   . Fixed bug GH-11550 (MySQL Statement has a empty query result when
     the response field has changed, also Segmentation fault).
     (Yurunsoft)
+  . Fixed invalid error message "Malformed packet" when connection is dropped.
+    (Kamil Tekiela)
 
 - Opcache:
   . Fixed bug GH-11715 (opcache.interned_strings_buffer either has no effect or
diff --git a/ext/mysqlnd/mysqlnd_protocol_frame_codec.c b/ext/mysqlnd/mysqlnd_protocol_frame_codec.c
@@ -202,6 +202,7 @@ MYSQLND_METHOD(mysqlnd_pfc, send)(MYSQLND_PFC * const pfc, MYSQLND_VIO * const v
 	if (bytes_sent <= 0) {
 		DBG_ERR_FMT("Can't %zu send bytes", count);
 		SET_CLIENT_ERROR(error_info, CR_SERVER_GONE_ERROR, UNKNOWN_SQLSTATE, mysqlnd_server_gone);
+		bytes_sent = 0; // the return type is unsigned and 0 represents an error condition
 	}
 	DBG_RETURN(bytes_sent);
 }

Original file line number	Diff line number	Diff line change
`@@ -202,6 +202,7 @@ MYSQLND_METHOD(mysqlnd_pfc, send)(MYSQLND_PFC * const pfc, MYSQLND_VIO * const v`
`202`	`202`	`if (bytes_sent <= 0) {`
`203`	`203`	`DBG_ERR_FMT("Can't %zu send bytes", count);`
`204`	`204`	`SET_CLIENT_ERROR(error_info, CR_SERVER_GONE_ERROR, UNKNOWN_SQLSTATE, mysqlnd_server_gone);`
	`205`	`+ bytes_sent = 0; // the return type is unsigned and 0 represents an error condition`
`205`	`206`	`}`
`206`	`207`	`DBG_RETURN(bytes_sent);`
`207`	`208`	`}`