- Fixed Bug #35978 %n format string specifier wrongly implemented

diff --git a/main/snprintf.c b/main/snprintf.c
index a7e50701eda7cb8aab68fe697dd85240d38a70cb..caaf3b78c0458302beeb44539618dd7545ef9ef1 100644 (file)
--- a/main/snprintf.c
+++ b/main/snprintf.c
@@ -1015,7 +1015,7 @@ static int format_converter(register buffy * odp, const char *fmt,
 
                                case 'n':
                                        *(va_arg(ap, int *)) = cc;
-                                       break;
+                                       goto skip_output;
 
                                        /*
                                         * Always extract the argument as a "char *" pointer. We 
@@ -1096,6 +1096,7 @@ fmt_error:
                        if (adjust_width && adjust == LEFT && min_width > s_len)
                                PAD(min_width, s_len, pad_char);
                }
+skip_output:
                fmt++;
        }
        odp->nextb = sp;

diff --git a/main/spprintf.c b/main/spprintf.c
index d090d7dee4c55c532f73455be999d57054cae80c..bb357caca30ecdcca7a915ed265352a138a68931 100644 (file)
--- a/main/spprintf.c
+++ b/main/spprintf.c
@@ -722,7 +722,7 @@ fmt_string:
 
                                case 'n':
                                        *(va_arg(ap, int *)) = xbuf->len;
-                                       break;
+                                       goto skip_output;
 
                                        /*
                                         * Always extract the argument as a "char *" pointer. We 
@@ -802,6 +802,7 @@ fmt_error:
                                PAD(unicode, xbuf, min_width - s_len, pad_char);
                        }
                }
+skip_output:
                fmt++;
        }
        return;