Changeset 298 for trunk

Timestamp:

03/17/2008 07:57:55 (8 months ago)

Author:

indeyets

Message:

fixed bug#31 (broken yaml caused segfault)

Location:

trunk/ext/php

Files:

• . (modified) (1 prop)
• CHANGELOG (modified) (1 diff)
• phpext.c (modified) (5 diffs)
• phpunit-tests/TestLoad.php (modified) (1 diff)
• phpunit-tests/bug31.yaml (added)

trunk/ext/php/CHANGELOG

@@ -1 +1 @@
 --- %YAML:1.0
+- version: 0.9.3
+  date: 2008-??-??
+  status: beta
+  changes:
+    - fixed bug#31 (broken yaml caused segfault)
+
 - version: 0.9.2
   date: 2007-11-22

trunk/ext/php/phpext.c

@@ -37 +37 @@
 #endif
 
-#define PHP_SYCK_VERSION "0.9.2"
+#define PHP_SYCK_VERSION "0.9.3-dev"
 
 /**
@@ -509 +509 @@
                                 }
                         } else if (strncmp(n->type_id, "php/hash::", 10) == 0) {
-                                /* some classm which implements ArrayAccess */
+                                /* some class which implements ArrayAccess */
                                 SYMID oid;
                                 size_t i;
@@ -594 +594 @@
 {
         char *endl = p->cursor;
+        zval *exc;
         TSRMLS_FETCH();
 
@@ -601 +602 @@
         endl[0] = '\0';
 
-        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);
+        exc = 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);
+        exc->refcount = 2; // hack
 
         st_foreach(p->syms, my_cleaner, NULL);
@@ -832 +834 @@
         }
 
-
         syck_free_parser(parser);
 }

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

@@ -208 +208 @@
         $this->assertSame('teststring', $obj->test());
     }
+
+    public function testBug31()
+    {
+        try {
+            $obj = syck_load(file_get_contents(dirname(__FILE__).'/bug31.yaml'));
+            $this->assertTrue(false);
+        } catch (SyckException $e) {
+            $this->assertTrue(true);
+        }
+    }
 }