Changeset 8d30e02 in code for icb.c

Timestamp:

Jan 18, 2015, 10:38:34 PM (10 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

f73b386

Parents:

d27dc1e

Message:

icb_vis improvements

• don't allow trailing single percentage signs;
• properly handle snprintf return value;

File:

• icb.c (modified) (2 diffs)

icb.c

@@ -635 +635 @@
         while ((size_t)di < dstsize - 1 && src[si] != '\0') {
                 if (src[si] == '%')
+                        if (di + 1 >= dstsize - 1)
+                                break;
                         dst[di++] = '%', dst[di] = '%';
                 else if (src[si] == ' ' && flags & VIS_SP)
@@ -643 +645 @@
                         td = snprintf(&dst[di], dstsize - di,
                             "\\%03o", (unsigned char)src[si]);
+                        if (td == -1 || td >= dstsize - di)
+                                break;
                         di += td - 1;
                 }