commit 69e02afb6e3c346671db157d8518c50fae3374ca
author Petteri Aimonen <jpa@git.mail.kapsi.fi> Tue Jun 23 13:28:21 2020 +0300
committer Petteri Aimonen <jpa@git.mail.kapsi.fi> Tue Jun 23 13:28:21 2020 +0300
tree cc7233afd33dcbe3badf76b8e0c577b18b09de1d
parent 6801500e23d255c11ee1a2b4c23be999f6834630

Rework bytes size check (#547)

The previous check was prone to giving warnings on various platforms.
Also there is no real need to check for other than PB_ATYPE_STATIC, as
anyone passing a pointer variable is responsible for having correctly
allocated the array.

pb_encode.c

diff --git a/pb_encode.c b/pb_encode.c
index aee120b..54cd5ba 100644
--- a/pb_encode.c
+++ b/pb_encode.c
@@ -842,8 +842,8 @@
         return pb_encode_string(stream, NULL, 0);
     }
     
-    if ((size_t)bytes->size > ((size_t)-1) - offsetof(pb_bytes_array_t, bytes) ||
-        (PB_ATYPE(field->type) == PB_ATYPE_STATIC && PB_BYTES_ARRAY_T_ALLOCSIZE(bytes->size) > field->data_size))
+    if (PB_ATYPE(field->type) == PB_ATYPE_STATIC &&
+        bytes->size > field->data_size - offsetof(pb_bytes_array_t, bytes))
     {
         PB_RETURN_ERROR(stream, "bytes size exceeded");
     }