diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-06-08 19:14:06 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-06-08 19:14:06 -0700 |
| commit | 5bc4bf28c9d4e734c793ff591627d3c01cf6b4b7 (patch) | |
| tree | 1c41cf65ee535f0bebcd2d3d6b3d6b956bb1499e /print-forces.c | |
| parent | 26687fd6b92943a63d561a7e7f6f6d422296f81c (diff) | |
| download | tcpdump-5bc4bf28c9d4e734c793ff591627d3c01cf6b4b7.tar.gz | |
Check the return value of some print routines.
Some routines return -1 on error; bail and return -1 if they do.
Diffstat (limited to 'print-forces.c')
| -rw-r--r-- | print-forces.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/print-forces.c b/print-forces.c index ec11635b..438aa279 100644 --- a/print-forces.c +++ b/print-forces.c @@ -216,7 +216,6 @@ pdatacnt_print(register const u_char * pptr, register u_int len, u_int16_t IDcnt, u_int16_t op_msk, int indent) { u_int i; - int rc; u_int32_t id; char *ib = indent_pr(indent, 0); @@ -282,9 +281,10 @@ pdatacnt_print(register const u_char * pptr, register u_int len, chk_op_type(type, op_msk, ops->op_msk); - rc = ops->print((const u_char *)pdtlv, + if (ops->print((const u_char *)pdtlv, tll + pad + TLV_HDRL, op_msk, - indent + 2); + indent + 2) == -1) + return -1; len -= (TLV_HDRL + pad + tll); } else { printf("Invalid path data content type 0x%x len %d\n", @@ -404,7 +404,6 @@ recpdoptlv_print(register const u_char * pptr, register u_int len, { const struct forces_tlv *pdtlv = (struct forces_tlv *)pptr; int tll; - int rc = 0; int invtlv; u_int16_t type; register const u_char *dp; @@ -434,7 +433,8 @@ recpdoptlv_print(register const u_char * pptr, register u_int len, EXTRACT_16BITS(&pdtlv->length), EXTRACT_16BITS(&pdtlv->length) - TLV_HDRL); - rc = pdata_print(dp, tll, op_msk, indent + 1); + if (pdata_print(dp, tll, op_msk, indent + 1) == -1) + return -1; pdtlv = GO_NXT_TLV(pdtlv, len); } |