Skip to content

Commit 353c78e

Browse files
committed
Merge pull request #543
2 parents 17da705 + f2b4eb7 commit 353c78e

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

src/BSON/ObjectID.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,24 +62,20 @@ static bool php_phongo_objectid_init(php_phongo_objectid_t *intern)
6262

6363
/* Initialize the object from a hex string and return whether it was successful.
6464
* An exception will be thrown on error. */
65-
static bool php_phongo_objectid_init_from_hex_string(php_phongo_objectid_t *intern, const char *oid, phongo_zpp_char_len oid_len TSRMLS_DC)
65+
static bool php_phongo_objectid_init_from_hex_string(php_phongo_objectid_t *intern, const char *hex, phongo_zpp_char_len hex_len TSRMLS_DC)
6666
{
67-
char *tid = zend_str_tolower_dup(oid, oid_len);
68-
69-
if (bson_oid_is_valid(tid, oid_len)) {
67+
if (bson_oid_is_valid(hex, hex_len)) {
7068
bson_oid_t oid;
7169

72-
bson_oid_init_from_string(&oid, tid);
70+
bson_oid_init_from_string(&oid, hex);
7371
bson_oid_to_string(&oid, intern->oid);
7472
intern->initialized = true;
7573

76-
efree(tid);
7774
return true;
7875
}
7976

80-
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Error parsing ObjectID string: %s", oid);
77+
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Error parsing ObjectID string: %s", hex);
8178

82-
efree(tid);
8379
return false;
8480
}
8581

0 commit comments

Comments
 (0)