zebra: Fix label manager memory leak (#5680)

[mirror_frr.git] / isisd / isis_misc.c

diff --git a/isisd/isis_misc.c b/isisd/isis_misc.c
index d4c38efaf3016ed1c8f0a36758ba79262b0d5be9..a7f491e87d8265e5ffeec2391a60b75edc86ed95 100644 (file)
--- a/isisd/isis_misc.c
+++ b/isisd/isis_misc.c
@@ -117,7 +117,8 @@ int dotformat2buff(uint8_t *buff, const char *dotted)
                        break;
                }
 
-               if ((isxdigit((int)*pos)) && (isxdigit((int)*(pos + 1)))) {
+               if ((isxdigit((unsigned char)*pos)) &&
+                   (isxdigit((unsigned char)*(pos + 1)))) {
                        memcpy(number, pos, 2);
                        pos += 2;
                } else {
@@ -157,7 +158,8 @@ int sysid2buff(uint8_t *buff, const char *dotted)
                        pos++;
                        continue;
                }
-               if ((isxdigit((int)*pos)) && (isxdigit((int)*(pos + 1)))) {
+               if ((isxdigit((unsigned char)*pos)) &&
+                   (isxdigit((unsigned char)*(pos + 1)))) {
                        memcpy(number, pos, 2);
                        pos += 2;
                } else {
@@ -519,7 +521,7 @@ void log_multiline(int priority, const char *prefix, const char *format, ...)
        char *p;
 
        va_start(ap, format);
-       p = asnprintfrr(MTYPE_TMP, shortbuf, sizeof(shortbuf), format, ap);
+       p = vasnprintfrr(MTYPE_TMP, shortbuf, sizeof(shortbuf), format, ap);
        va_end(ap);
 
        if (!p)
@@ -542,7 +544,7 @@ void vty_multiline(struct vty *vty, const char *prefix, const char *format, ...)
        char *p;
 
        va_start(ap, format);
-       p = asnprintfrr(MTYPE_TMP, shortbuf, sizeof(shortbuf), format, ap);
+       p = vasnprintfrr(MTYPE_TMP, shortbuf, sizeof(shortbuf), format, ap);
        va_end(ap);
 
        if (!p)