Merge pull request #498 from haberman/grpc-fixes

Fix NULL + 0 UBSAN error
3 years ago · 5c89d4d8d0
parent 180ab22cd9 5b09146f02
commit 5c89d4d8d0
1 changed files with 1 additions and 1 deletions
--- a/upb/encode.c
+++ b/upb/encode.c
@ -538,8 +538,8 @@ static void encode_message(upb_encstate* e, const upb_Message* msg,
     * other. */
    size_t ext_count;
    const upb_Message_Extension* ext = _upb_Message_Getexts(msg, &ext_count);
-    const upb_Message_Extension* end = ext + ext_count;
    if (ext_count) {
+      const upb_Message_Extension* end = ext + ext_count;
      for (; ext != end; ext++) {
        if (UPB_UNLIKELY(m->ext == upb_ExtMode_IsMessageSet)) {
          encode_msgset_item(e, ext);