1 files changed, 56 insertions, 47 deletions

diff --git a/library/backend/vcc.y b/library/backend/vcc.y
index e326a64..5bcf0cb 100644
--- a/library/backend/vcc.y
+++ b/library/backend/vcc.y
@@ -496,49 +496,49 @@ static void lexPushMode(enum LexMode mode)
     if (lexBuf.lexModeStackTop == (MAX_LEX_MODE_STACK_SIZE-1))
         yyerror("lexical context stack overflow");
     else {
         lexBuf.lexModeStack[++lexBuf.lexModeStackTop] = mode;
         }
     }
 
 static void lexPopMode(int top)
     {
     /* special case of pop for ease of error recovery -- this
         version will never underflow */
     if (top)
         lexBuf.lexModeStackTop = 0;
     else
         if (lexBuf.lexModeStackTop > 0) lexBuf.lexModeStackTop--;
     }
 
 static int lexWithinMode(enum LexMode mode) {
     unsigned long i;
     for (i=0;i<lexBuf.lexModeStackTop;i++)
         if (mode == lexBuf.lexModeStack[i]) return 1;
     return 0;
     }
 
-static char lexGetc_()
+static int lexGetc_()

     {
     /* get next char from input, no buffering. */
     if (lexBuf.curPos == lexBuf.inputLen)
         return EOF;
     else if (lexBuf.inputString)
         return *(lexBuf.inputString + lexBuf.curPos++);
     else {
 #ifdef INCLUDEMFC
         char result;
         return lexBuf.inputFile->Read(&result, 1) == 1 ? result : EOF;
 #else
         return fgetc(lexBuf.inputFile);
 #endif
         }
     }
 
 static int lexGeta()
     {
     ++lexBuf.len;
     return (lexBuf.buf[lexBuf.getPtr] = lexGetc_());
     }
 
 static int lexGeta_(int i)
     {
@@ -910,102 +910,111 @@ static char * lexGetDataFromBase64()
 
 static int match_begin_end_name(int end) {
     int token;
     lexSkipWhite();
     if (lexLookahead() != ':') return ID;
     lexSkipLookahead();
     lexSkipWhite();
     token = match_begin_name(end);
     if (token == ID) {
         lexPushLookaheadc(':');
         DBG_(("db: ID '%s'\n", yylval.str));
         return ID;
         }
     else if (token != 0) {
         lexSkipLookaheadWord();
         deleteStr(yylval.str);
         DBG_(("db: begin/end %d\n", token));
         return token;
         }
     return 0;
     }
 
 static char* lexGetQuotedPrintable()
     {
-    char cur;
-
+    int c;

+    lexSkipWhite();

+    c = lexLookahead();

     lexClearToken();
-    do {
-        cur = lexGetc();
-        switch (cur) {
-            case '=': {
-                int c = 0;
-                int next[2];
-                int i;
-                for (i = 0; i < 2; i++) {
-                    next[i] = lexGetc();
-                    if (next[i] >= '0' && next[i] <= '9')
-                        c = c * 16 + next[i] - '0';
-                    else if (next[i] >= 'A' && next[i] <= 'F')
-                        c = c * 16 + next[i] - 'A' + 10;
-                    else
+

+    while (c != EOF && c != ';') {

+        if (c == '\n') {

+            // break, leave '\n' on remaining chars.

                         break;
+        } else if (c == '=') {

+            int cur = 0;

+            int next;

+

+            lexSkipLookahead(); // skip '='

+            next = lexLookahead();

+

+            if (next == '\n') {

+                // skip and only skip the \n

+                lexSkipLookahead(); 

+                c = lexLookahead();

+                ++mime_lineNum; // aid in error reporting

+                continue;

+            } else if (next >= '0' && next <= '9') {

+                cur = next - '0';

+            } else if (next >= 'A' && next <= 'F') {

+                cur = next - 'A' + 10;

+            } else {

+                // we have been sent buggy stuff. doesn't matter

+                // what we do so long as we keep going.

+                // should probably spit an error here

+                c = lexLookahead();

+                continue;

                     }
-                if (i == 0) {
-                    /* single '=' follow by LINESEP is continuation sign? */
-                    if (next[0] == '\n') {
-                        ++mime_lineNum;
-                        }
-                    else {
-                        lexPushLookaheadc('=');
-                        goto EndString;
-                        }
+

+            lexSkipLookahead(); // skip A-Z0-9

+            next = lexLookahead();

+

+            cur = cur * 16;

+            // this time really just expecting 0-9A-F

+            if (next >= '0' && next <= '9') {

+                cur += next - '0';

+            } else if (next >= 'A' && next <= 'F') {

+                cur += next - 'A' + 10;

+            } else {

+                // we have been sent buggy stuff. doesn't matter

+                // what we do so long as we keep going.

+                // should probably spit an error here

+                c = lexLookahead();

+                continue;

                     }
-                else if (i == 1) {
-                    lexPushLookaheadc(next[1]);
-                    lexPushLookaheadc(next[0]);
-                    lexAppendc('=');
+

+            // got a valid escaped =.  append it.

+            lexSkipLookahead(); // skip second 0-9A-F

+            lexAppendc(cur);

                 } else {
-                    lexAppendc(c);
+            lexSkipLookahead(); // skip whatever we just read.

+            lexAppendc(c); // and append it.

                     }
-                break;
-                } /* '=' */
-            case '\n': {
-                lexPushLookaheadc('\n');
-                goto EndString;
+        c = lexLookahead();

                 }
-            case (char)EOF:
-                break;
-            default:
-                lexAppendc(cur);
-                break;
-            } /* switch */
-        } while (cur != (char)EOF);
-
-EndString:
     lexAppendc(0);
-    return lexStr();
-    } /* LexQuotedPrintable */
+    return c==EOF?0:lexStr();

+}

 
 static int yylex() {
 
     int lexmode = LEXMODE();
     if (lexmode == L_VALUES) {
         int c = lexGetc();
         if (c == ';') {
             DBG_(("db: SEMICOLON\n"));
             lexPushLookaheadc(c);
             handleMoreRFC822LineBreak(c);
             lexSkipLookahead();
             return SEMICOLON;
             }
         else if (strchr("\n",c)) {
             ++mime_lineNum;
             /* consume all line separator(s) adjacent to each other */
             c = lexLookahead();
             while (strchr("\n",c)) {
                 lexSkipLookahead();
                 c = lexLookahead();
                 ++mime_lineNum;
                 }
             DBG_(("db: LINESEP\n"));
             return LINESEP;