Merge branch '3.1' into 3.3

mariadb-corporation · May 2, 2023 · 85b7bde · 85b7bde
2 parents 374f0ee + a3bba46
commit 85b7bde
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c
@@ -1043,7 +1043,7 @@ unpack_fields(const MYSQL *mysql,
     for (i=0; i < field_count; i++)
     {
       uint length= (uint)(row->data[i+1] - row->data[i] - 1);
-      if (!row->data[i] && row->data[i][length])
+      if (!row->data[i] || row->data[i][length])
         goto error;
 
       *(char **)(((char *)field) + rset_field_offsets[i*2])=