iliaa Wed Mar 7 00:52:40 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard browscap.c
Log:
malloc() -> pemalloc()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/browscap.c?r1=1.85.2.2.2.2&r2=1.85.2.2.2.3&diff_format=u
Index: php-src/ext/standard/browscap.c
diff -u php-src/ext/standard/browscap.c:1.85.2.2.2.2
php-src/ext/standard/browscap.c:1.85.2.2.2.3
--- php-src/ext/standard/browscap.c:1.85.2.2.2.2 Mon Jan 1 09:36:08 2007
+++ php-src/ext/standard/browscap.c Wed Mar 7 00:52:40 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: browscap.c,v 1.85.2.2.2.2 2007/01/01 09:36:08 sebastian Exp $ */
+/* $Id: browscap.c,v 1.85.2.2.2.3 2007/03/07 00:52:40 iliaa Exp $ */
#include "php.h"
#include "php_regex.h"
@@ -55,7 +55,7 @@
php_strtolower(Z_STRVAL_P(pattern), Z_STRLEN_P(pattern));
- t = (char *) malloc(Z_STRLEN_P(pattern)*2 + 3);
+ t = (char *) safe_pemalloc(Z_STRLEN_P(pattern), 2, 3, 1);
t[0] = '^';
@@ -100,7 +100,7 @@
zval *new_property;
char *new_key;
- new_property = (zval *) malloc(sizeof(zval));
+ new_property = (zval *) pemalloc(sizeof(zval),
1);
INIT_PZVAL(new_property);
Z_STRVAL_P(new_property) =
zend_strndup(Z_STRVAL_P(arg2), Z_STRLEN_P(arg2));
Z_STRLEN_P(new_property) = Z_STRLEN_P(arg2);
@@ -118,14 +118,14 @@
HashTable *section_properties;
/*printf("'%s'
(%d)\n",$1.value.str.val,$1.value.str.len+1);*/
- current_section = (zval *) malloc(sizeof(zval));
+ current_section = (zval *)
pemalloc(sizeof(zval), 1);
INIT_PZVAL(current_section);
- processed = (zval *) malloc(sizeof(zval));
+ processed = (zval *) pemalloc(sizeof(zval), 1);
INIT_PZVAL(processed);
- unprocessed = (zval *) malloc(sizeof(zval));
+ unprocessed = (zval *) pemalloc(sizeof(zval),
1);
INIT_PZVAL(unprocessed);
- section_properties = (HashTable *)
malloc(sizeof(HashTable));
+ section_properties = (HashTable *)
pemalloc(sizeof(HashTable), 1);
zend_hash_init(section_properties, 0, NULL,
(dtor_func_t) browscap_entry_dtor, 1);
current_section->value.ht = section_properties;
current_section->type = IS_ARRAY;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
