rasmus                                   Sun, 07 Aug 2011 00:25:22 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=314389

Log:
Use snprintf here instead to make the static analyzers happy.

Changed paths:
    U   php/php-src/branches/PHP_5_4/Zend/zend.c
    U   php/php-src/trunk/Zend/zend.c

Modified: php/php-src/branches/PHP_5_4/Zend/zend.c
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend.c    2011-08-07 00:18:38 UTC (rev 
314388)
+++ php/php-src/branches/PHP_5_4/Zend/zend.c    2011-08-07 00:25:22 UTC (rev 
314389)
@@ -247,7 +247,7 @@
                        break;
                case IS_RESOURCE:
                        Z_STRVAL_P(expr_copy) = (char *) 
emalloc(sizeof("Resource id #") - 1 + MAX_LENGTH_OF_LONG);
-                       Z_STRLEN_P(expr_copy) = sprintf(Z_STRVAL_P(expr_copy), 
"Resource id #%ld", Z_LVAL_P(expr));
+                       Z_STRLEN_P(expr_copy) = snprintf(Z_STRVAL_P(expr_copy), 
sizeof("Resource id #") - 1 + MAX_LENGTH_OF_LONG, "Resource id #%ld", 
Z_LVAL_P(expr));
                        break;
                case IS_ARRAY:
                        Z_STRLEN_P(expr_copy) = sizeof("Array") - 1;

Modified: php/php-src/trunk/Zend/zend.c
===================================================================
--- php/php-src/trunk/Zend/zend.c       2011-08-07 00:18:38 UTC (rev 314388)
+++ php/php-src/trunk/Zend/zend.c       2011-08-07 00:25:22 UTC (rev 314389)
@@ -247,7 +247,7 @@
                        break;
                case IS_RESOURCE:
                        Z_STRVAL_P(expr_copy) = (char *) 
emalloc(sizeof("Resource id #") - 1 + MAX_LENGTH_OF_LONG);
-                       Z_STRLEN_P(expr_copy) = sprintf(Z_STRVAL_P(expr_copy), 
"Resource id #%ld", Z_LVAL_P(expr));
+                       Z_STRLEN_P(expr_copy) = snprintf(Z_STRVAL_P(expr_copy), 
sizeof("Resource id #") - 1 + MAX_LENGTH_OF_LONG, "Resource id #%ld", 
Z_LVAL_P(expr));
                        break;
                case IS_ARRAY:
                        Z_STRLEN_P(expr_copy) = sizeof("Array") - 1;

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

Reply via email to