commit 37e14a6f6b43baa3b6ff06bade5a39a25fd98b3f
author android-build-team Robot <android-build-team-robot@google.com> Tue Mar 31 02:08:12 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Mar 31 02:08:12 2020 +0000
tree 07f3ec85703cc9695ce2a24b034109d6828849ea
parent 04de7558b4297c37868ca32b5bfa707e2d9a9d9e
parent b73cea24f89621456c950b102d475ffbd4227334

Snap for 6348860 from b73cea24f89621456c950b102d475ffbd4227334 to rvc-release

Change-Id: I6da26a6b580fff4ee91524f983fe730beead9494

libavb/avb_util.c

diff --git a/libavb/avb_util.c b/libavb/avb_util.c
index 938ce4e..c0064cf 100644
--- a/libavb/avb_util.c
+++ b/libavb/avb_util.c
@@ -195,6 +195,12 @@
                     size_t str2_len) {
   uint64_t combined_len;
 
+  // Doesn't make sense to pass 0 for buf_size since there's
+  // no room for the terminating NUL byte.
+  if (buf_size == 0) {
+    return false;
+  }
+
   if (!avb_safe_add(&combined_len, str1_len, str2_len)) {
     avb_error("Overflow when adding string sizes.\n");
     return false;