Import of the watch repository from Pebble

third_party/nanopb/tests/regression/issue_342/SConscript

@@ -0,0 +1,11 @@
+# Regression test for #342:
+# Possible null-pointer dereference in pb_decode.c
+
+Import("env")
+
+env.NanopbProto("extensions")
+testprog = env.Program(["test_extensions.c", "extensions.pb.c",
+                '$COMMON/pb_decode.o', '$COMMON/pb_encode.o', '$COMMON/pb_common.o'])
+
+env.RunTest(testprog)
+

third_party/nanopb/tests/regression/issue_342/extensions.proto

@@ -0,0 +1,11 @@
+syntax = "proto2";
+
+message BaseMessage {
+    extensions 100 to 200;
+}
+
+extend BaseMessage {
+    optional string string_extension = 100;
+}
+
+

third_party/nanopb/tests/regression/issue_342/test_extensions.c

@@ -0,0 +1,52 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <pb_encode.h>
+#include <pb_decode.h>
+#include "extensions.pb.h"
+#include "unittests.h"
+
+static bool write_string(pb_ostream_t *stream, const pb_field_t *field, void * const *arg)
+{
+    return pb_encode_tag_for_field(stream, field) &&
+           pb_encode_string(stream, (const void*)"abc", 3);
+}
+
+int main(int argc, char **argv)
+{
+    int status = 0;
+    uint8_t buffer[64];
+    pb_size_t msglen = 0;
+    
+    {
+        pb_ostream_t stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
+        pb_callback_t callback_def = {{0}};
+        pb_extension_t ext = {0};
+        BaseMessage msg = {0};
+
+        callback_def.funcs.encode = &write_string;
+        ext.type = &string_extension;
+        ext.dest = &callback_def;
+        msg.extensions = &ext;
+        
+        TEST(pb_encode(&stream, BaseMessage_fields, &msg));
+        
+        msglen = stream.bytes_written;
+        TEST(msglen > 3);
+    }
+    
+    {
+        pb_istream_t stream = pb_istream_from_buffer(buffer, msglen);
+        pb_extension_t ext = {0};
+        BaseMessage msg = {0};
+        
+        ext.type = &string_extension;
+        /* Note: ext.dest remains null to trigger bug #342 */
+        msg.extensions = &ext;
+    
+        TEST(pb_decode(&stream, BaseMessage_fields, &msg));
+    }
+    
+    return status;
+}
+