Use proper type (16bit) when extracting path id count

Signed-off-by: Jamal Hadi Salim <[email protected]>
Signed-off-by: Michael Richardson <[email protected]>

diff --git a/forces.h b/forces.h
index b9cf072fb6113827f5834d5eb53af71be009c82d..ed497d41d7b1cd1c991e0f98bac71075c9f994c6 100644 (file)
--- a/forces.h
+++ b/forces.h
@@ -585,7 +585,7 @@ int pkeyitlv_print(register const u_char * pptr, register u_int len,
                   u_int16_t op_msk, int indent);
 
 int pdatacnt_print(register const u_char * pptr, register u_int len,
-              u_int32_t IDcnt, u_int16_t op_msk, int indent);
+              u_int16_t IDcnt, u_int16_t op_msk, int indent);
 int pdata_print(register const u_char * pptr, register u_int len,
            u_int16_t op_msk, int indent);
 

diff --git a/print-forces.c b/print-forces.c
index 4bb82782e0ab329f111a391841e51d32cfc268b5..033580e51bc2ac8a6e0227d68d71d9743ab5c14b 100644 (file)
--- a/print-forces.c
+++ b/print-forces.c
@@ -213,7 +213,7 @@ trunc:
 
 int
 pdatacnt_print(register const u_char * pptr, register u_int len,
-              u_int32_t IDcnt, u_int16_t op_msk, int indent)
+              u_int16_t IDcnt, u_int16_t op_msk, int indent)
 {
        u_int i;
        int rc;
@@ -314,7 +314,7 @@ pdata_print(register const u_char * pptr, register u_int len,
        char *ib = indent_pr(indent, 0);
        u_int minsize = 0;
        int more_pd = 0;
-       u_int32_t idcnt = 0;
+       u_int16_t idcnt = 0;
 
        TCHECK(*pdh);
        if (len < sizeof(struct pathdata_h))