From: Anatol Belski <ab@php.net>
Date: Sun, 14 Sep 2014 08:24:10 +0000 (+0200)
Subject: fix conditions
X-Git-Tag: PRE_NATIVE_TLS_MERGE~158^2~85^2~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea4ab02446e5a0078f10cfdde351afe99a6e90f9;p=php

fix conditions

substraction from an unsigned
---

diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
index a6e2517b2b..332b0b2163 100644
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -524,7 +524,7 @@ size_t php_mysqlnd_auth_write(void * _packet, MYSQLND_CONN_DATA * conn TSRMLS_DC
 		int1store(p, packet->auth_data_len);
 		++p;
 /*!!!!! is the buffer big enough ??? */
-		if ((sizeof(buffer) - (p - buffer)) < packet->auth_data_len) {
+		if (sizeof(buffer) < (packet->auth_data_len + (p - buffer))) {
 			DBG_ERR("the stack buffer was not enough!!");
 			DBG_RETURN(0);
 		}
@@ -596,7 +596,7 @@ size_t php_mysqlnd_auth_write(void * _packet, MYSQLND_CONN_DATA * conn TSRMLS_DC
 				} ZEND_HASH_FOREACH_END();
 			}
 #endif
-			if ((sizeof(buffer) - (p - buffer)) >= (ca_payload_len + php_mysqlnd_net_store_length_size(ca_payload_len))) {
+			if (sizeof(buffer) >= (ca_payload_len + php_mysqlnd_net_store_length_size(ca_payload_len) + (p - buffer))) {
 				p = php_mysqlnd_net_store_length(p, ca_payload_len);
 
 #ifdef OLD_CODE