Merge pull request #201

An error occurred

from veblush/ubsan2

Fixed ubsan error on memmove
6 years ago · b70f68269a
parent 638d114a1a 3838f62aa5
commit b70f68269a
1 changed files with 3 additions and 1 deletions
--- a/upb/encode.c
+++ b/upb/encode.c
@ -48,7 +48,9 @@ static bool upb_encode_growbuffer(upb_encstate *e, size_t bytes) {
  CHK(new_buf);

  /* We want previous data at the end, realloc() put it at the beginning. */
-  memmove(new_buf + new_size - old_size, e->buf, old_size);
+  if (old_size > 0) {
+    memmove(new_buf + new_size - old_size, e->buf, old_size);
+  }

  e->ptr = new_buf + new_size - (e->limit - e->ptr);
  e->limit = new_buf + new_size;