[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_wireprotocol.c

2009-06-28 Thread Pierre-Alain Joye 
pajoye  Sun Jun 28 12:04:44 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_wireprotocol.c 
  Log:
  - fix build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.4.2.32r2=1.4.2.33diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.32 
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.33
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.32 Thu Jun 25 19:03:52 2009
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c  Sun Jun 28 12:04:44 2009
@@ -25,6 +25,7 @@
 #include mysqlnd_statistics.h
 #include mysqlnd_palloc.h
 #include mysqlnd_debug.h
+#include mysqlnd/mysqlnd_block_alloc.h
 #include ext/standard/sha1.h
 #include php_network.h
 #include zend_ini.h
@@ -1473,7 +1474,7 @@
end_field = (current_field = start_field = fields) + field_count;
for (i = 0; current_field  end_field; current_field++, i++) {
/* Don't reverse the order. It is significant!*/
-   void *obj;
+   void *obj = NULL;
zend_bool allocated = TRUE;
zend_uchar *this_field_len_pos = p;
/* php_mysqlnd_net_field_length() call should be after 
*this_field_len_pos = p; */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_wireprotocol.c

2009-06-28 Thread Johannes Schlüter 
johannesSun Jun 28 21:52:51 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_wireprotocol.c 
  Log:
  Fix path
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.4.2.33r2=1.4.2.34diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.33 
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.34
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.33 Sun Jun 28 12:04:44 2009
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c  Sun Jun 28 21:52:51 2009
@@ -25,7 +25,7 @@
 #include mysqlnd_statistics.h
 #include mysqlnd_palloc.h
 #include mysqlnd_debug.h
-#include mysqlnd/mysqlnd_block_alloc.h
+#include mysqlnd_block_alloc.h
 #include ext/standard/sha1.h
 #include php_network.h
 #include zend_ini.h



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_wireprotocol.c

2009-06-11 Thread Andrey Hristov 
andrey  Thu Jun 11 08:35:47 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_wireprotocol.c 
  Log:
  MFH:
Check the pointer before calling a function on it, or we will crash.
This is a very rare situation where the server is totally broken.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.4.2.26r2=1.4.2.27diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.26 
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.27
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.26 Thu Jun 11 08:30:08 2009
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c  Thu Jun 11 08:35:47 2009
@@ -1343,7 +1343,7 @@
break;
}
}
-   if (ret == FAIL) {
+   if (ret == FAIL  (*buffer)) {
(*buffer)-free_chunk((*buffer), TRUE TSRMLS_CC);
*buffer = NULL;
}



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_wireprotocol.c

2009-06-11 Thread Andrey Hristov 
andrey  Thu Jun 11 17:54:04 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_wireprotocol.c 
  Log:
  Put these in an ifdef because they are not used at all if the zval cache
  is off.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.4.2.28r2=1.4.2.29diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.28 
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.29
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.28 Thu Jun 11 14:36:48 2009
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c  Thu Jun 11 17:54:04 2009
@@ -1362,8 +1362,10 @@
zend_uchar *null_ptr, bit;
zval **current_field, **end_field, **start_field;
zend_bool as_unicode = conn-options.numeric_and_datetime_as_unicode;
+#ifdef USE_ZVAL_CACHE
zend_bool allocated;
void *obj = NULL;
+#endif
 
DBG_ENTER(php_mysqlnd_rowp_read_binary_protocol);
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_wireprotocol.c

2009-06-11 Thread Pierre Joye 
thanks! :)

On Thu, Jun 11, 2009 at 7:54 PM, Andrey Hristovand...@php.net wrote:
 andrey          Thu Jun 11 17:54:04 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/mysqlnd        mysqlnd_wireprotocol.c
  Log:
  Put these in an ifdef because they are not used at all if the zval cache
  is off.


 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.4.2.28r2=1.4.2.29diff_format=u
 Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
 diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.28 
 php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.29
 --- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.28 Thu Jun 11 14:36:48 
 2009
 +++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c  Thu Jun 11 17:54:04 2009
 @@ -1362,8 +1362,10 @@
        zend_uchar *null_ptr, bit;
        zval **current_field, **end_field, **start_field;
        zend_bool as_unicode = conn-options.numeric_and_datetime_as_unicode;
 +#ifdef USE_ZVAL_CACHE
        zend_bool allocated;
        void *obj = NULL;
 +#endif

        DBG_ENTER(php_mysqlnd_rowp_read_binary_protocol);




 --
 PHP CVS Mailing List (http://www.php.net/)
 To unsubscribe, visit: http://www.php.net/unsub.php





-- 
Pierre

http://blog.thepimp.net | http://www.libgd.org

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_wireprotocol.c

2009-06-11 Thread Pierre-Alain Joye 
pajoye  Thu Jun 11 14:36:48 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_wireprotocol.c 
  Log:
  - silent warning and make it less ambiguous
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.4.2.27r2=1.4.2.28diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.27 
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.28
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.27 Thu Jun 11 08:35:47 2009
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c  Thu Jun 11 14:36:48 2009
@@ -611,7 +611,7 @@
/* pad2 */
p+= 13;
 
-   if (p - buf  packet-header.size) {
+   if ((size_t)(p - buf)  packet-header.size) {
/* scramble_buf is split into two parts */
memcpy(packet-scramble_buf + SCRAMBLE_LENGTH_323,
p, SCRAMBLE_LENGTH - SCRAMBLE_LENGTH_323);
@@ -625,7 +625,7 @@
DBG_INF_FMT(server_capabilities=%d charset_no=%d server_status=%d,
packet-server_capabilities, 
packet-charset_no, packet-server_status);
 
-   if (p - begin  packet-header.size) {
+   if ((size_t)(p - begin)  packet-header.size) {
DBG_ERR_FMT(GREET packet %d bytes shorter than expected, p - 
begin - packet-header.size);
php_error_docref(NULL TSRMLS_CC, E_WARNING, GREET packet 
MYSQLND_SZ_T_SPEC bytes shorter than expected,
 p - begin - 
packet-header.size);
@@ -810,7 +810,7 @@
p+= 2;
 
/* There is a message */
-   if (packet-header.size  p - buf  (i = 
php_mysqlnd_net_field_length(p))) {
+   if (packet-header.size  (size_t) (p - buf)  (i = 
php_mysqlnd_net_field_length(p))) {
packet-message = pestrndup((char *)p, MIN(i, sizeof(buf) - (p 
- buf)), conn-persistent);
packet-message_len = i;
} else {
@@ -821,7 +821,7 @@
packet-affected_rows, packet-last_insert_id, 
packet-server_status,
packet-warning_count);
 
-   if (p - begin  packet-header.size) {
+   if ((size_t)(p - begin)  packet-header.size) {
DBG_ERR_FMT(OK packet %d bytes shorter than expected, p - 
begin - packet-header.size);
php_error_docref(NULL TSRMLS_CC, E_WARNING, OK packet 
MYSQLND_SZ_T_SPEC bytes shorter than expected,
 p - begin - 
packet-header.size);
@@ -894,7 +894,7 @@
packet-server_status = 0;
}
 
-   if (p - begin  packet-header.size) {
+   if ((size_t)(p - begin)  packet-header.size) {
DBG_ERR_FMT(EOF packet %d bytes shorter than expected, p - 
begin - packet-header.size);
php_error_docref(NULL TSRMLS_CC, E_WARNING, EOF packet 
MYSQLND_SZ_T_SPEC bytes shorter than expected,
 p - begin - 
packet-header.size);
@@ -1044,7 +1044,7 @@
packet-warning_count = uint2korr(p);
p+=2;
/* Check for additional textual data */
-   if (packet-header.size   (p - buf)  (len = 
php_mysqlnd_net_field_length(p))) {
+   if (packet-header.size   (size_t) (p - buf)  (len = 
php_mysqlnd_net_field_length(p))) {
packet-info_or_local_file = mnd_pemalloc(len + 
1, conn-persistent);
memcpy(packet-info_or_local_file, p, len);
packet-info_or_local_file[len] = '\0';
@@ -1059,7 +1059,7 @@
/* Result set */
break;
}
-   if (p - begin  packet-header.size) {
+   if ((size_t)(p - begin)  packet-header.size) {
DBG_ERR_FMT(RSET_HEADER packet %d bytes shorter than 
expected, p - begin - packet-header.size);
php_error_docref(NULL TSRMLS_CC, E_WARNING, GREET packet 
MYSQLND_SZ_T_SPEC bytes shorter than expected,
 p - begin - 
packet-header.size);
@@ -1187,7 +1187,7 @@
  NULL_LENGTH (0xFB) comes from COM_FIELD_LIST when the default value 
is NULL.
  Otherwise the string is length encoded.
*/
-   if (packet-header.size  (p - buf) 
+   if (packet-header.size  (size_t)(p - buf) 
(len = php_mysqlnd_net_field_length(p)) 
len != MYSQLND_NULL_LENGTH)
{
@@ -1199,7 +1199,7 @@
p += len;
}
 
-   if (p - begin  packet-header.size) {
+   if ((size_t)(p - begin)  packet-header.size) {
DBG_ERR_FMT(RSET field packet %d bytes shorter than expected, 
p - begin - packet-header.size);
php_error_docref(NULL TSRMLS_CC, E_WARNING, Result set field 
packet MYSQLND_SZ_T_SPEC bytes

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_wireprotocol.c

2008-02-25 Thread Rob Richards 
rrichards   Mon Feb 25 22:57:09 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_wireprotocol.c 
  Log:
  MFH: fix win32 build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.4.2.11r2=1.4.2.12diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.11 
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.12
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.11 Wed Feb 20 15:18:17 2008
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c  Mon Feb 25 22:57:09 2008
@@ -1672,8 +1672,10 @@
 static
 void php_mysqlnd_rowp_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
 {
+   php_mysql_packet_row *p;
+
DBG_ENTER(php_mysqlnd_rowp_free_mem);
-   php_mysql_packet_row *p= (php_mysql_packet_row *) _packet;
+   p = (php_mysql_packet_row *) _packet;
if (p-row_buffer) {
p-row_buffer-free_chunk(p-row_buffer, TRUE TSRMLS_CC);
p-row_buffer = NULL;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php