andrey          Tue Sep 16 14:35:02 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/mysqlnd        mysqlnd_statistics.h mysqlnd_wireprotocol.c 
  Log:
  MFH:
  Fix a crash introduced yesterday in mysqlnd, non-zts mode - missing if () for
  STAT_LAST was accessing wrong memory thus overwritting method pointers.
  
  Windows doesn't have atoll(), which is C99, C89 has only atoi() + atol().
  Win has _atoi64, so use it.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_statistics.h?r1=1.4.2.9&r2=1.4.2.10&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_statistics.h
diff -u php-src/ext/mysqlnd/mysqlnd_statistics.h:1.4.2.9 
php-src/ext/mysqlnd/mysqlnd_statistics.h:1.4.2.10
--- php-src/ext/mysqlnd/mysqlnd_statistics.h:1.4.2.9    Sun Sep 14 22:10:24 2008
+++ php-src/ext/mysqlnd/mysqlnd_statistics.h    Tue Sep 16 14:35:01 2008
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqlnd_statistics.h,v 1.4.2.9 2008/09/14 22:10:24 pajoye Exp $ */
+/* $Id: mysqlnd_statistics.h,v 1.4.2.10 2008/09/16 14:35:01 andrey Exp $ */
 
 #ifndef MYSQLND_STATISTICS_H
 #define MYSQLND_STATISTICS_H
@@ -111,8 +111,8 @@
                if (statistic2 != STAT_LAST) 
mysqlnd_global_stats->values[(statistic2)]+= v2; \
                tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
                if ((conn_stats)) { \
-                       ((MYSQLND_STATS *) conn_stats)->values[(statistic1)]+= 
v1; \
-                       ((MYSQLND_STATS *) conn_stats)->values[(statistic2)]+= 
v2; \
+                       if (statistic1 != STAT_LAST) ((MYSQLND_STATS *) 
conn_stats)->values[(statistic1)]+= v1; \
+                       if (statistic2 != STAT_LAST) ((MYSQLND_STATS *) 
conn_stats)->values[(statistic2)]+= v2; \
                } \
        } \
  }
@@ -205,8 +205,8 @@
                if (statistic1 != STAT_LAST) 
mysqlnd_global_stats->values[(statistic1)]+= v1; \
                if (statistic2 != STAT_LAST) 
mysqlnd_global_stats->values[(statistic2)]+= v2; \
                if ((conn_stats)) { \
-                       ((MYSQLND_STATS *) conn_stats)->values[(statistic1)]+= 
v1; \
-                       ((MYSQLND_STATS *) conn_stats)->values[(statistic2)]+= 
v2; \
+                       if (statistic1 != STAT_LAST) ((MYSQLND_STATS *) 
conn_stats)->values[(statistic1)]+= v1; \
+                       if (statistic2 != STAT_LAST) ((MYSQLND_STATS *) 
conn_stats)->values[(statistic2)]+= v2; \
                } \
        } \
  }
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.4.2.19&r2=1.4.2.20&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.19 
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.20
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.19 Mon Sep 15 18:09:20 2008
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c  Tue Sep 16 14:35:01 2008
@@ -1560,10 +1560,20 @@
                                if (perm_bind.pack_len < SIZEOF_LONG)
                                {
                                        /* direct conversion */
-                                       int64 v = atoll((char *) p);
+                                       int64 v =
+#ifndef PHP_WIN32
+                                               atoll((char *) p);
+#else
+                                               _atoi64((char *) p);
+#endif
                                        ZVAL_LONG(*current_field, v);
                                } else {
-                                       uint64 v = (uint64) atoll((char *) p);
+                                       uint64 v =
+#ifndef PHP_WIN32
+                                               (uint64) atoll((char *) p);
+#else
+                                               (uint64) _atoi64((char *) p);
+#endif
                                        zend_bool uns = 
fields_metadata[i].flags & UNSIGNED_FLAG? TRUE:FALSE;
                                        /* We have to make it ASCIIZ 
temporarily */
 #if SIZEOF_LONG==8
@@ -1580,13 +1590,11 @@
                                        }
                                }
                                *(p + len) = save;
-                       } else if (as_int_or_float && perm_bind.php_type == 
IS_DOUBLE)
-                       {
+                       } else if (as_int_or_float && perm_bind.php_type == 
IS_DOUBLE) {
                                zend_uchar save = *(p + len);
                                /* We have to make it ASCIIZ temporarily */
                                *(p + len) = '\0';
-                               double v = atof((char *) p);
-                               ZVAL_DOUBLE(*current_field, v);
+                               ZVAL_DOUBLE(*current_field, atof((char *) p));
                                *(p + len) = save;
                        } else
 #endif /* MYSQLND_STRING_TO_INT_CONVERSION */



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

Reply via email to