Skip to content

Commit fd356f3

Browse files
jmikoladerickr
authored andcommitted
Prevent duplication and reduce strlen() usage
1 parent 5c366ee commit fd356f3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

php_phongo.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -545,12 +545,12 @@ static void phongo_bulk_write_error_add_message(char **tmp_msg, bson_t *errors)
545545
}
546546

547547
if (bson_iter_init_find(&inner_iter, &cbson, "errmsg") && BSON_ITER_HOLDS_UTF8(&inner_iter)) {
548-
char *tmp_errmsg = bson_iter_dup_utf8(&inner_iter, NULL);
548+
const char *tmp_errmsg = bson_iter_utf8(&inner_iter, NULL);
549+
size_t tmp_errmsg_len = strlen(tmp_errmsg);
549550

550-
*tmp_msg = erealloc(*tmp_msg, strlen(*tmp_msg) + strlen(tmp_errmsg) + 5);
551+
*tmp_msg = erealloc(*tmp_msg, strlen(*tmp_msg) + tmp_errmsg_len + 5);
551552
strncpy(*tmp_msg + strlen(*tmp_msg), " :: ", 5);
552-
strncpy(*tmp_msg + strlen(*tmp_msg), tmp_errmsg, strlen(tmp_errmsg) + 1);
553-
efree(tmp_errmsg);
553+
strncpy(*tmp_msg + strlen(*tmp_msg), tmp_errmsg, tmp_errmsg_len + 1);
554554
}
555555
}
556556
}

0 commit comments

Comments
 (0)