Merge pull request #210 from haberman/asanfix

A memory safety fix, found by ASAN.
5 years ago · cdb3779e99
parent 4e77dc16c1 555b60b062
commit cdb3779e99
1 changed files with 2 additions and 1 deletions
--- a/upb/table.c
+++ b/upb/table.c
@ -276,7 +276,8 @@ static upb_tabkey strcopy(lookupkey_t k2, upb_alloc *a) {
  char *str = upb_malloc(a, k2.str.len + sizeof(uint32_t) + 1);
  if (str == NULL) return 0;
  memcpy(str, &len, sizeof(uint32_t));
-  memcpy(str + sizeof(uint32_t), k2.str.str, k2.str.len + 1);
+  memcpy(str + sizeof(uint32_t), k2.str.str, k2.str.len);
+  str[sizeof(uint32_t) + k2.str.len] = '\0';
  return (uintptr_t)str;
 }