Merge pull request #32 from lategoodbye/master

Fix segmentation fault
2012-12-29 23:44:40 -08:00 · 2012-12-29 23:44:40 -08:00 · a409a917b9
commit a409a917b9
parent ded841eeb5 9c9c0201f9
2 changed files with 9 additions and 0 deletions
--- a/mbus/mbus-protocol.c
+++ b/mbus/mbus-protocol.c
@ -2554,6 +2554,14 @@ mbus_parse(mbus_frame *frame, u_char *data, size_t data_size)
                frame->length1  = data[1];
                frame->length2  = data[2];
                
+                if (frame->length1 < 3)
+                {
+                    snprintf(error_str, sizeof(error_str), "Invalid M-Bus frame length.");
+                
+                    // not a valid M-bus frame
+                    return -2;
+                }
+                
                if (frame->length1 != frame->length2)
                {
                    snprintf(error_str, sizeof(error_str), "Invalid M-Bus frame length.");
--- a/test/test-frames/invalid_length.hex
+++ b/test/test-frames/invalid_length.hex
@ -0,0 +1 @@
+68 00 00 68 08 16