From: Shuah Khan <shuah.khan@hp.com>
Date: Tue, 20 Sep 2011 19:20:11 +0000 (-0600)
Subject: Fix - lldpd netsnmp sub-agent segfaults when null write_method is passed in
X-Git-Tag: 0.5.5~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=676d46b92d2907eeaf554a86fa8e450c91b74e08;p=thirdparty%2Flldpd.git

Fix - lldpd netsnmp sub-agent segfaults when null write_method is passed in
---

diff --git a/src/agent.c b/src/agent.c
index cb829dee..c38b115c 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -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];