Fixes #196

protobuf-c/protobuf-c.c

@@ -258,13 +258,13 @@ get_tag_size(unsigned number)
 static inline size_t
 uint32_size(uint32_t v)
 {
-	if (v < (1 << 7)) {
+	if (v < (1UL << 7)) {
 		return 1;
-	} else if (v < (1 << 14)) {
+	} else if (v < (1UL << 14)) {
 		return 2;
-	} else if (v < (1 << 21)) {
+	} else if (v < (1UL << 21)) {
 		return 3;
-	} else if (v < (1 << 28)) {
+	} else if (v < (1UL << 28)) {
 		return 4;
 	} else {
 		return 5;
@@ -285,13 +285,13 @@ int32_size(int32_t v)
 {
 	if (v < 0) {
 		return 10;
-	} else if (v < (1 << 7)) {
+	} else if (v < (1UL << 7)) {
 		return 1;
-	} else if (v < (1 << 14)) {
+	} else if (v < (1UL << 14)) {
 		return 2;
-	} else if (v < (1 << 21)) {
+	} else if (v < (1UL << 21)) {
 		return 3;
-	} else if (v < (1 << 28)) {
+	} else if (v < (1UL << 28)) {
 		return 4;
 	} else {
 		return 5;
@@ -348,15 +348,15 @@ uint64_size(uint64_t v)
 
 	if (upper_v == 0) {
 		return uint32_size((uint32_t) v);
-	} else if (upper_v < (1 << 3)) {
+	} else if (upper_v < (1UL << 3)) {
 		return 5;
-	} else if (upper_v < (1 << 10)) {
+	} else if (upper_v < (1UL << 10)) {
 		return 6;
-	} else if (upper_v < (1 << 17)) {
+	} else if (upper_v < (1UL << 17)) {
 		return 7;
-	} else if (upper_v < (1 << 24)) {
+	} else if (upper_v < (1UL << 24)) {
 		return 8;
-	} else if (upper_v < (1U << 31)) {
+	} else if (upper_v < (1UL << 31)) {
 		return 9;
 	} else {
 		return 10;

t/generated-code2/test-generated-code2.c

@@ -2149,6 +2149,18 @@ test_message_check(void)
   assert(1 == protobuf_c_message_check(&m.base));
 }
 
+static void
+test_large_int_packed_size(void)
+{
+  Foo__TestMessRequiredSInt64 m = FOO__TEST_MESS_REQUIRED_SINT64__INIT;
+
+  m.test = 200;
+  assert(3 == foo__test_mess_required_sint64__get_packed_size(&m));
+
+  m.test = 32000;
+  assert(4 == foo__test_mess_required_sint64__get_packed_size(&m));
+}
+
 /* === simple testing framework === */
 
 typedef void (*TestFunc) (void);
@@ -2284,6 +2296,8 @@ static Test tests[] =
   { "test field flags", test_field_flags },
 
   { "test message_check()", test_message_check },
+
+  { "test large int packed size", test_large_int_packed_size },
 };
 #define n_tests (sizeof(tests)/sizeof(Test))