Fix leak in SplDoublyLinkedList::add()

nikic · nikic · commit 497fadcacd8f · 2021-04-19T13:08:35.000+02:00
diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c
@@ -1215,8 +1215,6 @@ PHP_METHOD(SplDoublyLinkedList, add)
 		element->prev = elem;
 
 		intern->llist->count++;
-
-		Z_TRY_ADDREF(elem->data);
 	}
 } /* }}} */
 
diff --git a/ext/spl/tests/dllist_013.phpt b/ext/spl/tests/dllist_013.phpt
@@ -29,6 +29,14 @@ echo $dll->pop()."\n";
 echo $dll->pop()."\n";
 echo $dll->pop()."\n";
 echo $dll->pop()."\n";
+
+// Test refcounted value
+$str = "foo";
+$str .= "bar";
+$dll->add(0, null);
+$dll->add(0, $str);
+var_dump($dll->shift());
+
 ?>
 --EXPECT--
 Exception: SplDoublyLinkedList::add(): Argument #1 ($index) is out of range
@@ -40,3 +48,4 @@ Exception: SplDoublyLinkedList::add(): Argument #1 ($index) is out of range
 3
 2
 1
+string(6) "foobar"

Original file line number	Diff line number	Diff line change
`@@ -1215,8 +1215,6 @@ PHP_METHOD(SplDoublyLinkedList, add)`
`1215`	`1215`	`element->prev = elem;`
`1216`	`1216`
`1217`	`1217`	`intern->llist->count++;`
`1218`		`-`
`1219`		`- Z_TRY_ADDREF(elem->data);`
`1220`	`1218`	`}`
`1221`	`1219`	`} /* }}} */`
`1222`	`1220`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,14 @@ echo $dll->pop()."\n";`
`29`	`29`	`echo $dll->pop()."\n";`
`30`	`30`	`echo $dll->pop()."\n";`
`31`	`31`	`echo $dll->pop()."\n";`
	`32`	`+`
	`33`	`+// Test refcounted value`
	`34`	`+$str = "foo";`
	`35`	`+$str .= "bar";`
	`36`	`+$dll->add(0, null);`
	`37`	`+$dll->add(0, $str);`
	`38`	`+var_dump($dll->shift());`
	`39`	`+`
`32`	`40`	`?>`
`33`	`41`	`--EXPECT--`
`34`	`42`	`Exception: SplDoublyLinkedList::add(): Argument #1 ($index) is out of range`
`@@ -40,3 +48,4 @@ Exception: SplDoublyLinkedList::add(): Argument #1 ($index) is out of range`
`40`	`48`	`3`
`41`	`49`	`2`
`42`	`50`	`1`
	`51`	`+string(6) "foobar"`