svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c branches/PHP_5_4/ext/mysqlnd/mysqlnd_result.c trunk/ext/mysqlnd/mysqlnd_result.c
| From: | Andrey Hristov | Date: | Tue, 17 May 2011 09:44:11 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c branches/PHP_5_4/ext/mysqlnd/mysqlnd_result.c trunk/ext/mysqlnd/mysqlnd_result.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64967@lists.php.net to get a copy of this message | ||
andrey Tue, 17 May 2011 09:44:11 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=311122
Log:
exchange a "trap" with an error
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
U php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_result.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2011-05-17 05:16:29 UTC (rev 311121)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2011-05-17 09:44:11 UTC (rev 311122)
@@ -1583,7 +1583,7 @@
} else if (result->m.fetch_row == result->m.fetch_row_normal_unbuffered) {
DBG_RETURN(mysqlnd_fetch_row_unbuffered_c(result TSRMLS_CC));
} else {
- *((int*)NULL) = 1;
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "result->m.fetch_row has invalid value. Report
to the developers");
}
}
DBG_RETURN(ret);
Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_result.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_result.c 2011-05-17 05:16:29 UTC (rev 311121)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_result.c 2011-05-17 09:44:11 UTC (rev 311122)
@@ -1546,7 +1546,7 @@
} else if (result->m.fetch_row == result->m.fetch_row_normal_unbuffered) {
DBG_RETURN(mysqlnd_fetch_row_unbuffered_c(result TSRMLS_CC));
} else {
- *((int*)NULL) = 1;
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "result->m.fetch_row has invalid value. Report
to the developers");
}
}
DBG_RETURN(ret);
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c 2011-05-17 05:16:29 UTC (rev 311121)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c 2011-05-17 09:44:11 UTC (rev 311122)
@@ -1546,7 +1546,7 @@
} else if (result->m.fetch_row == result->m.fetch_row_normal_unbuffered) {
DBG_RETURN(mysqlnd_fetch_row_unbuffered_c(result TSRMLS_CC));
} else {
- *((int*)NULL) = 1;
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "result->m.fetch_row has invalid value. Report
to the developers");
}
}
DBG_RETURN(ret);