pnmdec: make pnm_get more robust

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago · bb7744a45b
parent 9b34ae4a65
commit bb7744a45b
1 changed files with 3 additions and 3 deletions
--- a/libavcodec/pnm.c
+++ b/libavcodec/pnm.c
@ -34,12 +34,12 @@ static void pnm_get(PNMContext *sc, char *str, int buf_size)
    int c;

    /* skip spaces and comments */
-    for (;;) {
+    while (sc->bytestream < sc->bytestream_end) {
        c = *sc->bytestream++;
        if (c == '#')  {
-            do {
+            while (c != '\n' && sc->bytestream < sc->bytestream_end) {
                c = *sc->bytestream++;
-            } while (c != '\n' && sc->bytestream < sc->bytestream_end);
+            }
        } else if (!pnm_space(c)) {
            break;
        }