DOM/XPath: Use ZSTR_LEN abstraction instead of direct member access

nielsdos · nielsdos · commit 35e96f621b7b · 2025-04-19T18:00:00.000+02:00
diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
@@ -527,7 +527,7 @@ PHP_METHOD(DOMXPath, quote) {
 			smart_str_appendc(&output, ',');
 		}
 		ZEND_ASSERT(ptr == end);
-		ZSTR_VAL(output.s)[output.s->len - 1] = ')';
+		ZSTR_VAL(output.s)[ZSTR_LEN(output.s) - 1] = ')';
 		RETURN_STR(smart_str_extract(&output));
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -527,7 +527,7 @@ PHP_METHOD(DOMXPath, quote) {`
`527`	`527`	`smart_str_appendc(&output, ',');`
`528`	`528`	`}`
`529`	`529`	`ZEND_ASSERT(ptr == end);`
`530`		`- ZSTR_VAL(output.s)[output.s->len - 1] = ')';`
	`530`	`+ ZSTR_VAL(output.s)[ZSTR_LEN(output.s) - 1] = ')';`
`531`	`531`	`RETURN_STR(smart_str_extract(&output));`
`532`	`532`	`}`
`533`	`533`	`}`