Changeset 858 in openpam for trunk/lib

Timestamp:

Mar 19, 2015, 12:07:19 AM (6 years ago)

Author:

Dag-Erling Smørgrav

Message:

Increment by three, not one, after successfully decoding a character.
Add a boundary check.

File:

• trunk/lib/liboath/oath_uri_decode.c (modified) (2 diffs)

trunk/lib/liboath/oath_uri_decode.c

@@ -59 +59 @@
                 ilen = strlen(in);
         for (ipos = opos = 0; ipos < ilen && in[ipos] != '\0'; ++ipos, ++opos) {
-                if (in[ipos] == '%' &&
+                if (in[ipos] == '%' && ipos + 2 < ilen &&
                     is_xdigit(in[ipos + 1]) && is_xdigit(in[ipos + 2])) {
                         if (out != NULL && opos < olen - 1)
@@ -65 +65 @@
                                     unhex(in[ipos + 2]);
                         ilen += 2;
+                        ipos += 2;
                 } else {
                         if (out != NULL && opos < olen - 1)