avoid editing managed string, fix version

The string buffer pointed to by message_class_name appears to be managed by the php engine, since duplicate strings (e.g. literal class names) are being stored in the same place. Assuming it is much safer to increment the pointer variable itself rather than mess up with the buffer's contents. Might fix chobie/protoc-gen-php#7
gsnoff · Oct 31, 2014 · b358ebd · b358ebd
1 parent dd38827
commit b358ebd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/extension_registry.c b/extension_registry.c
@@ -159,11 +159,7 @@ PHP_METHOD(protocolbuffers_extension_registry, add)
 	}
 
 	if (message_class_name[0] == '\\') {
-		int x;
-		for (x = 0; x < message_class_name_len-1; x++) {
-			message_class_name[x] = message_class_name[x+1];
-		}
-		message_class_name[message_class_name_len-1] = '\0';
+		message_class_name++;
 		message_class_name_len--;
 	}
 

diff --git a/php_protocolbuffers.h b/php_protocolbuffers.h
@@ -32,7 +32,7 @@
 #define PHP_PROTOCOLBUFFERS_H
 
 #define PHP_PROTOCOLBUFFERS_EXTNAME "protocolbuffers"
-#define PHP_PROTOCOLBUFFERS_VERSION "0.2.5"
+#define PHP_PROTOCOLBUFFERS_VERSION "0.2.6"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"