Changeset 325

Timestamp:

07/22/2008 05:41:52 (4 months ago)

Author:

indeyets

Message:

fixed PECL-bug 14384 (tabs in YAML cause segfault)

Location:

trunk/ext/php

Files:

• phpext.c (modified) (1 diff)
• phpunit-tests/TestLoad.php (modified) (1 diff)

trunk/ext/php/phpext.c

@@ -609 +609 @@
         endl[0] = '\0';
 
-        exc = zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "%s on line %d, col %d: '%s'", str, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
-
-        Z_SET_REFCOUNT_P(exc, 2);
-
-        st_foreach(p->syms, my_cleaner, NULL);
-
-        p->bonus = exc;
+        if (NULL == p->bonus) {
+                /* silence second exceptions */
+                exc = zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "%s on line %d, col %d: '%s'", str, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
+
+                Z_SET_REFCOUNT_P(exc, 2);
+
+                p->bonus = exc;
+        }
+
+        if (p->syms)
+                st_foreach(p->syms, my_cleaner, NULL);
 }
 

trunk/ext/php/phpunit-tests/TestLoad.php

@@ -218 +218 @@
         }
     }
+
+    public function testBugPECL_14384()
+    {
+        $broken_string = 'test:
+        var: value
+        var2: value2';
+
+        try {
+            syck_load($broken_string);
+            $this->assertTrue(false);
+        } catch (SyckException $e) {
+            $this->assertTrue(true);
+        }
+    }
 }