Minor issue in userparse, always return T_OP_INVALID on error
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Fri, 24 Jan 2014 17:47:08 +0000 (17:47 +0000)
committerArran Cudbard-Bell <a.cudbardb@freeradius.org>
Fri, 24 Jan 2014 23:01:05 +0000 (23:01 +0000)
src/lib/valuepair.c

index 8150fff..bbc1334 100644 (file)
@@ -2195,8 +2195,9 @@ FR_TOKEN userparse(TALLOC_CTX *ctx, char const *buffer, VALUE_PAIR **list)
        /*
         *      We allow an empty line.
         */
-       if (buffer[0] == 0)
+       if (buffer[0] == 0) {
                return T_EOL;
+       }
 
        head = NULL;
        tail = &head;
@@ -2219,7 +2220,7 @@ FR_TOKEN userparse(TALLOC_CTX *ctx, char const *buffer, VALUE_PAIR **list)
                        }
                        if (pairmark_xlat(vp, raw.r_opand) < 0) {
                                talloc_free(vp);
-
+                               last_token = T_OP_INVALID;
                                break;
                        }
                } else {