Merge pull request #297

Author: jmikola

src/BSON/ObjectID.c

@@ -67,15 +67,16 @@ PHP_METHOD(ObjectID, __construct)
 	zend_restore_error_handling(&error_handling TSRMLS_CC);
 
 	if (id) {
-		zend_str_tolower(id, id_len);
-		if (bson_oid_is_valid(id, id_len)) {
+		char *tid = zend_str_tolower_dup(id, id_len);
+		if (bson_oid_is_valid(tid, id_len)) {
 			bson_oid_t oid;
 
-			bson_oid_init_from_string(&oid, id);
+			bson_oid_init_from_string(&oid, tid);
 			bson_oid_to_string(&oid, intern->oid);
 		} else {
 			phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "%s", "Invalid BSON ID provided");
 		}
+		efree(tid);
 	} else {
 		bson_oid_t oid;
 

tests/bson/bug0672.phpt

@@ -0,0 +1,30 @@
+--TEST--
+PHPC-672: ObjectID constructor should not modify string argument's memory
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$id = '56925B7330616224D0000001';
+var_dump(new MongoDB\BSON\ObjectID($id));
+var_dump($id);
+
+$invalidId = 'T123456';
+throws(function() use ($invalidId) {
+    new MongoDB\BSON\ObjectID($invalidId);
+}, "MongoDB\\Driver\\Exception\\InvalidArgumentException");
+var_dump($invalidId);
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+object(MongoDB\BSON\ObjectID)#%d (%d) {
+  ["oid"]=>
+  string(24) "56925b7330616224d0000001"
+}
+string(24) "56925B7330616224D0000001"
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+string(7) "T123456"
+===DONE===