Changeset 1de522d for libpacketdump

Timestamp:

11/14/17 17:20:06 (4 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

cachetimestamps, develop, dpdk-ndag, etsilive, master, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance

Children:

ccef50c

Parents:

e8db2d4

Message:

Fix maybe uninitialised warnings in OSPF libpacketdump decoders.

Location:

libpacketdump

Files:

• ospf2_1001.c (modified) (2 diffs)
• ospf2_4.c (modified) (1 diff)

libpacketdump/ospf2_1001.c

@@ -33 +33 @@
 DLLEXPORT void decode(int link_type UNUSED,const char *packet,unsigned len) {
         unsigned char *link_ptr = NULL;
-        libtrace_ospf_link_v2_t *link;
+        libtrace_ospf_link_v2_t *link = NULL;
         uint32_t link_len;
         libtrace_ospf_router_lsa_v2_t *hdr;
@@ -58 +58 @@
                 return;
         while (trace_get_next_ospf_link_v2(&link_ptr, &link, &len, &link_len) > 0) {
+                if (!link) {
+                        break;
+                }
                 printf(" OSPF Router Link: Id %s ", inet_ntoa(link->link_id));
                 printf("Data %s\n", inet_ntoa(link->link_data));

libpacketdump/ospf2_4.c

@@ -34 +34 @@
 DLLEXPORT void decode(int link_type UNUSED,const char *packet,unsigned len) {
         libtrace_ospf_ls_update_t *update = (libtrace_ospf_ls_update_t *)packet;
-        unsigned char *lsa_ptr;
-        uint8_t lsa_type;
-        libtrace_ospf_lsa_v2_t *lsa_hdr;
-        unsigned char *lsa_body;
+        unsigned char *lsa_ptr = NULL;
+        uint8_t lsa_type = 0;
+        libtrace_ospf_lsa_v2_t *lsa_hdr = NULL;
+        unsigned char *lsa_body = NULL;
         int i = 0;
         int max_lsas = 0;
         uint32_t rem = len;
-        uint16_t lsa_length;
+        uint16_t lsa_length = 0;