Changeset 290 for trunk

Timestamp:

10/24/2007 16:46:32 (13 months ago)

Author:

indeyets

Message:

freeing memory in error-handler

Files:

• trunk/ext/php/phpext.c (modified) (15 diffs)

trunk/ext/php/phpext.c

@@ -235 +235 @@
 SYMID php_syck_handler(SyckParser *p, SyckNode *n)
 {
-        zval *o;
+        zval *o = NULL;
 
         MAKE_STD_ZVAL(o);
@@ -383 +383 @@
                                 char *classname = emalloc(classname_len + 1);
                                 zend_class_entry **ce;
-                                zval *param;
+                                zval *param = NULL;
                                 TSRMLS_FETCH();
 
@@ -422 +422 @@
                                 for (i = 0; i < n->data.list->idx; i++) {
                                         SYMID oid = syck_seq_read(n, i);
-                                        zval *o2;
+                                        zval *o2 = NULL;
 
                                         syck_lookup_sym(p, oid, (char **) &o2); /* retrieving child-node */
@@ -449 +449 @@
                                         for (i = 0; i < n->data.list->idx; i++) {
                                                 SYMID oid = syck_seq_read(n, i);
-                                                zval *o2;
-                                                zval *key;
+                                                zval *o2 = NULL;
+                                                zval *key = NULL;
 
                                                 syck_lookup_sym(p, oid, (char **) &o2); /* retrieving child-node */
@@ -486 +486 @@
                                 SYMID oid;
                                 size_t i;
-                                zval *o2, *o3;
-                                zval *res;
+                                zval *o2 = NULL, *o3 = NULL;
+                                zval *res = NULL;
 
                                 array_init(o);
@@ -512 +512 @@
                                 SYMID oid;
                                 size_t i;
-                                zval *o2, *o3;
+                                zval *o2 = NULL, *o3 = NULL;
                                 size_t classname_len = strlen(n->type_id) - 10;
                                 char *classname = emalloc(classname_len + 1);
@@ -583 +583 @@
 }
 
+enum st_retval my_cleaner(char *key, char *value, char *smth)
+{
+        zval *ptr = (zval *)value;
+
+        zval_ptr_dtor(&ptr);
+        return ST_DELETE;
+}
+
 void php_syck_ehandler(SyckParser *p, const char *str)
 {
@@ -594 +602 @@
 
         zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "%s on line %d, col %d: '%s'", str, p->linect, p->cursor - p->lineptr, p->lineptr);
+
+        st_foreach(p->syms, my_cleaner, NULL);
 }
 
@@ -656 +666 @@
 
                                 for (zend_hash_internal_pointer_reset(tbl); zend_hash_has_more_elements(tbl) == SUCCESS; zend_hash_move_forward(tbl)) {
-                                        zval **ppzval;
+                                        zval **ppzval = NULL;
 
                                         zend_hash_get_current_data(tbl, (void **)&ppzval);
@@ -674 +684 @@
 
                                 for (zend_hash_internal_pointer_reset(tbl); zend_hash_has_more_elements(tbl) == SUCCESS; zend_hash_move_forward(tbl)) {
-                                        zval **ppzval;
+                                        zval **ppzval = NULL;
 
                                         zend_hash_get_current_data(tbl, (void **)&ppzval);
@@ -692 +702 @@
 
                                 for (zend_hash_internal_pointer_reset(tbl); zend_hash_has_more_elements(tbl) == SUCCESS; zend_hash_move_forward(tbl)) {
-                                        zval **ppzval, kzval;
+                                        zval **ppzval = NULL, kzval;
                                         char *key;
                                         uint key_len;
@@ -744 +754 @@
                         /* DateTime is encoded as timestamp */
                         if (strncmp(name, "DateTime", name_len) == 0) {
-                                zval *retval;
+                                zval *retval = NULL;
                                 zval constant;
 
@@ -760 +770 @@
                                         size_t prefix_len = strlen(prefix) + 1;
                                         char *tagname = emalloc(name_len + prefix_len);
-                                        zval *serialized;
+                                        zval *serialized = NULL;
 
                                         snprintf(tagname, name_len + prefix_len, "%s%s", prefix, name);
@@ -795 +805 @@
         int arg_len;
         SYMID v;
-        zval *obj;
+        zval *obj = NULL;
         SyckParser *parser;
 
@@ -824 +834 @@
                 zval_ptr_dtor(&obj);
         }
+
 
         syck_free_parser(parser);