]> git.ipfire.org Git - thirdparty/lldpd.git/commitdiff
Fix - lldpd netsnmp sub-agent segfaults when null write_method is passed in
authorShuah Khan <shuah.khan@hp.com>
Tue, 20 Sep 2011 19:20:11 +0000 (13:20 -0600)
committerVincent Bernat <bernat@luffy.cx>
Wed, 21 Sep 2011 05:34:50 +0000 (07:34 +0200)
src/agent.c

index cb829dee923d0b33496e9c2ae694d2ff1b6148b0..c38b115c4f3c6b1bf4e7706a0faf2c426bd5531b 100644 (file)
@@ -96,7 +96,7 @@ header_pmedindexed_table(struct variable *vp, oid *name, size_t *length,
                 *length = vp->namelen;
         }
 
-       *write_method = 0;
+       if(write_method != NULL) *write_method = 0;
        *var_len = sizeof(long);
 
        best[0] = best[1] = MAX_SUBID;
@@ -165,7 +165,7 @@ header_tprindexed_table(struct variable *vp, oid *name, size_t *length,
                 *length = vp->namelen;
         }
 
-       *write_method = 0;
+       if(write_method != NULL) *write_method = 0;
        *var_len = sizeof(long);
 
         switch (variant) {
@@ -264,7 +264,7 @@ header_pvindexed_table(struct variable *vp, oid *name, size_t *length,
                 *length = vp->namelen;
         }
 
-       *write_method = 0;
+       if(write_method != NULL) *write_method = 0;
        *var_len = sizeof(long);
 
         best[0] = best[1] = MAX_SUBID;
@@ -315,7 +315,7 @@ header_tprvindexed_table(struct variable *vp, oid *name, size_t *length,
                 *length = vp->namelen;
         }
 
-       *write_method = 0;
+       if(write_method != NULL) *write_method = 0;
        *var_len = sizeof(long);
 
         best[0] = best[1] = best[2] = best[3] = MAX_SUBID;
@@ -1440,7 +1440,7 @@ agent_h_local_management(struct variable *vp, oid *name, size_t *length,
                 *length = vp->namelen;
         }
 
-       *write_method = 0;
+       if(write_method != NULL) *write_method = 0;
        *var_len = sizeof(long);
 
         target = &name[vp->namelen];