From: Andrey Hristov <andrey@php.net>
Date: Tue, 17 May 2011 09:44:11 +0000 (+0000)
Subject: exchange a "trap" with an error
X-Git-Tag: php-5.5.0alpha1~2079
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c2f42b544485da1cc6e2b28bf93608068a587cc;p=php

exchange a "trap" with an error
---

diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index 30368f4346..f1c6332788 100644
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -1546,7 +1546,7 @@ MYSQLND_METHOD(mysqlnd_res, fetch_row_c)(MYSQLND_RES * result TSRMLS_DC)
 		} 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);