Fix #75: Handle zndocs/ndocs correctly

tomterl · bd808 · commit 730a781f7773 · 2023-03-12T09:24:13.000-06:00
Just changing the handling, that is param handling of ndocs and dtor call for zndocs, in yaml_parse_file to that in yaml_parse. That fixes #75 for me.
diff --git a/yaml.c b/yaml.c
@@ -407,7 +407,7 @@ PHP_FUNCTION(yaml_parse_file)
 	YAML_G(timestamp_decoder) = NULL;
 
 	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(),
-					"s|lza/", &filename, &filename_len, &pos, &zndocs,
+					"s|lz/a/", &filename, &filename_len, &pos, &zndocs,
 					&zcallbacks)) {
 		return;
 	}
@@ -451,7 +451,7 @@ PHP_FUNCTION(yaml_parse_file)
 
 	if (zndocs != NULL) {
 		/* copy document count to var user sent in */
-		zval_dtor(zndocs);
+		zval_ptr_dtor(zndocs);
 		ZVAL_LONG(zndocs, ndocs);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,7 @@ PHP_FUNCTION(yaml_parse_file)`
`407`	`407`	`YAML_G(timestamp_decoder) = NULL;`
`408`	`408`
`409`	`409`	`if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(),`
`410`		`- "s\|lza/", &filename, &filename_len, &pos, &zndocs,`
	`410`	`+ "s\|lz/a/", &filename, &filename_len, &pos, &zndocs,`
`411`	`411`	`&zcallbacks)) {`
`412`	`412`	`return;`
`413`	`413`	`}`
`@@ -451,7 +451,7 @@ PHP_FUNCTION(yaml_parse_file)`
`451`	`451`
`452`	`452`	`if (zndocs != NULL) {`
`453`	`453`	`/* copy document count to var user sent in */`
`454`		`- zval_dtor(zndocs);`
	`454`	`+ zval_ptr_dtor(zndocs);`
`455`	`455`	`ZVAL_LONG(zndocs, ndocs);`
`456`	`456`	`}`
`457`	`457`