From 93533f780be4ed5ea4d866c5eb7ff2220f377ae0 Mon Sep 17 00:00:00 2001 From: David Supplee Date: Tue, 12 Mar 2019 21:30:06 -0700 Subject: Add terminating character to zend_lookup_class call (#5871) * add terminating character * adjust name length input * add test cases * correct script name * Misc fixes * add new script to EXTRA_DIST list --- php/ext/google/protobuf/def.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'php/ext') diff --git a/php/ext/google/protobuf/def.c b/php/ext/google/protobuf/def.c index ef0f71167..184ae2d36 100644 --- a/php/ext/google/protobuf/def.c +++ b/php/ext/google/protobuf/def.c @@ -853,9 +853,10 @@ static zend_class_entry *register_class(const upb_filedef *file, fill_namespace(package, php_namespace, &namesink); fill_classname(fullname, package, prefix, &namesink, use_nested_submsg); + stringsink_string(&namesink, NULL, "\0", 1, NULL); PHP_PROTO_CE_DECLARE pce; - if (php_proto_zend_lookup_class(namesink.ptr, namesink.len, &pce) == + if (php_proto_zend_lookup_class(namesink.ptr, namesink.len - 1, &pce) == FAILURE) { zend_error( E_ERROR, -- cgit v1.2.3