Fixes for base64 decoding and encoding of vCard

4 files changed, 32 insertions, 39 deletions

diff --git a/library/backend/vcc.y b/library/backend/vcc.y
index 4c79368..bec2955 100644
--- a/library/backend/vcc.y
+++ b/library/backend/vcc.y
@@ -436,17 +436,17 @@ static void enterValues(const char *value)
 static void enterProps(const char *s)

     {

     curProp = addGroup(curObj,s);

     deleteStr(s);

     }

 

 static void enterAttr(const char *s1, const char *s2)

     {

-    const char *p1, *p2;

+    const char *p1, *p2=0;

     p1 = lookupProp_(s1);

     if (s2) {

 	VObject *a;

 	p2 = lookupProp_(s2);

 	a = addProp(curProp,p1);

 	setVObjectStringZValue(a,p2);

 	}

     else

@@ -808,29 +808,30 @@ static void finiLex() {
     free(lexBuf.strs);

     }

 

 

 /*-----------------------------------*/

 /* This parses and converts the base64 format for binary encoding into

  * a decoded buffer (allocated with new).  See RFC 1521.

  */

-static char * lexGetDataFromBase64()

+static int lexGetDataFromBase64()

     {

     unsigned long bytesLen = 0, bytesMax = 0;

     int quadIx = 0, pad = 0;

     unsigned long trip = 0;

     unsigned char b;

     int c;

     unsigned char *bytes = NULL;

     unsigned char *oldBytes = NULL;

 

     DBG_(("db: lexGetDataFromBase64\n"));

     while (1) {

 	c = lexGetc();

+	lexSkipWhite();

 	if (c == '\n') {

 	    ++mime_lineNum;

 	    if (lexLookahead() == '\n') {

 		/* a '\n' character by itself means end of data */

 		break;

 		}

 	    else continue; /* ignore '\n' */

 	    }

@@ -843,34 +844,35 @@ static char * lexGetDataFromBase64()
 		b = (unsigned char)(c - '0') + 52;

 	    else if (c == '+')

 		b = 62;

 	    else if (c == '/')

 		b = 63;

 	    else if (c == '=') {

 		b = 0;

 		pad++;

-	    } else if ((c == ' ') || (c == '\t')) {

-		continue;

 	    } else { /* error condition */

 		if (bytes) free(bytes);

 		else if (oldBytes) free(oldBytes);

 		// error recovery: skip until 2 adjacent newlines.

 		DBG_(("db: invalid character 0x%x '%c'\n", c,c));

 		if (c != EOF)  {

 		    c = lexGetc();

 		    while (c != EOF) {

-			if (c == '\n' && lexLookahead() == '\n') {

-			    ++mime_lineNum;

-			    break;

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

+			    lexSkipWhite();

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

+				++mime_lineNum;

+				break;

+				}

 			    }

 			c = lexGetc();

 			}

 		    }

-		return NULL;

+		return c != EOF;

 		}

 	    trip = (trip << 6) | b;

 	    if (++quadIx == 4) {

 		unsigned char outBytes[3];

 		int numOut;

 		int i;

 		for (i = 0; i < 3; i++) {

 		    outBytes[2-i] = (unsigned char)(trip & 0xFF);

@@ -906,17 +908,17 @@ static char * lexGetDataFromBase64()
     if (bytes) {

 	setValueWithSize(curProp,bytes,(unsigned int)bytesLen);

 	free(bytes);

 	}

     else if (oldBytes) {

 	setValueWithSize(curProp,oldBytes,(unsigned int)bytesLen);

 	free(oldBytes);

 	}

-    return 0;

+    return bytesLen;

     }

 

 static int match_begin_end_name(int end) {

     int token;

     lexSkipWhite();

     if (lexLookahead() != ':') return ID;

     lexSkipLookahead();

     lexSkipWhite();

@@ -937,17 +939,17 @@ static int match_begin_end_name(int end) {
 

 static char* lexGetQuotedPrintable()

 {

     int c;

     lexSkipWhite();

     c = lexLookahead();

     lexClearToken();

 

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

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

 	if (c == '\n') {

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

 	    break;

 	} else if (c == '=') {

 	    int cur = 0;

 	    int next;

 

 	    lexSkipLookahead(); // skip '='

@@ -1027,21 +1029,18 @@ static int yylex() {
 	    DBG_(("db: LINESEP\n"));

 	    return LINESEP;

 	    }

 	else {

 	    char *p = 0;

 	    lexPushLookaheadc(c);

 	    if (lexWithinMode(L_BASE64)) {

 		/* get each char and convert to bin on the fly... */

-		p = lexGetDataFromBase64();

-#if 0		
-		yylval.str = p;

-		return STRING;

-#endif		
+		yylval.str = NULL;

+		return lexGetDataFromBase64() ? STRING : 0;

 		}

 	    else if (lexWithinMode(L_QUOTED_PRINTABLE)) {

 		p = lexGetQuotedPrintable();

 		}

 	    else {

 #ifdef _SUPPORT_LINE_FOLDING

 		p = lexGet1Value();

 #else

diff --git a/library/backend/vcc_yacc.cpp b/library/backend/vcc_yacc.cpp
index 5f53aef..4006bc2 100644
--- a/library/backend/vcc_yacc.cpp
+++ b/library/backend/vcc_yacc.cpp
@@ -456,17 +456,17 @@ static void enterValues(const char *value)
 static void enterProps(const char *s)

     {

     curProp = addGroup(curObj,s);

     deleteStr(s);

     }

 

 static void enterAttr(const char *s1, const char *s2)

     {

-    const char *p1, *p2;

+    const char *p1, *p2=0;

     p1 = lookupProp_(s1);

     if (s2) {

 	VObject *a;

 	p2 = lookupProp_(s2);

 	a = addProp(curProp,p1);

 	setVObjectStringZValue(a,p2);

 	}

     else

@@ -828,29 +828,30 @@ static void finiLex() {
     free(lexBuf.strs);

     }

 

 

 /*-----------------------------------*/

 /* This parses and converts the base64 format for binary encoding into

  * a decoded buffer (allocated with new).  See RFC 1521.

  */

-static char * lexGetDataFromBase64()

+static int lexGetDataFromBase64()

     {

     unsigned long bytesLen = 0, bytesMax = 0;

     int quadIx = 0, pad = 0;

     unsigned long trip = 0;

     unsigned char b;

     int c;

     unsigned char *bytes = NULL;

     unsigned char *oldBytes = NULL;

 

     DBG_(("db: lexGetDataFromBase64\n"));

     while (1) {

 	c = lexGetc();

+	lexSkipWhite();

 	if (c == '\n') {

 	    ++mime_lineNum;

 	    if (lexLookahead() == '\n') {

 		/* a '\n' character by itself means end of data */

 		break;

 		}

 	    else continue; /* ignore '\n' */

 	    }

@@ -863,34 +864,35 @@ static char * lexGetDataFromBase64()
 		b = (unsigned char)(c - '0') + 52;

 	    else if (c == '+')

 		b = 62;

 	    else if (c == '/')

 		b = 63;

 	    else if (c == '=') {

 		b = 0;

 		pad++;

-	    } else if ((c == ' ') || (c == '\t')) {

-		continue;

 	    } else { /* error condition */

 		if (bytes) free(bytes);

 		else if (oldBytes) free(oldBytes);

 		// error recovery: skip until 2 adjacent newlines.

 		DBG_(("db: invalid character 0x%x '%c'\n", c,c));

 		if (c != EOF)  {

 		    c = lexGetc();

 		    while (c != EOF) {

-			if (c == '\n' && lexLookahead() == '\n') {

-			    ++mime_lineNum;

-			    break;

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

+			    lexSkipWhite();

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

+				++mime_lineNum;

+				break;

+				}

 			    }

 			c = lexGetc();

 			}

 		    }

-		return NULL;

+		return c != EOF;

 		}

 	    trip = (trip << 6) | b;

 	    if (++quadIx == 4) {

 		unsigned char outBytes[3];

 		int numOut;

 		int i;

 		for (i = 0; i < 3; i++) {

 		    outBytes[2-i] = (unsigned char)(trip & 0xFF);

@@ -926,17 +928,17 @@ static char * lexGetDataFromBase64()
     if (bytes) {

 	setValueWithSize(curProp,bytes,(unsigned int)bytesLen);

 	free(bytes);

 	}

     else if (oldBytes) {

 	setValueWithSize(curProp,oldBytes,(unsigned int)bytesLen);

 	free(oldBytes);

 	}

-    return 0;

+    return bytesLen;

     }

 

 static int match_begin_end_name(int end) {

     int token;

     lexSkipWhite();

     if (lexLookahead() != ':') return ID;

     lexSkipLookahead();

     lexSkipWhite();

@@ -957,17 +959,17 @@ static int match_begin_end_name(int end) {
 

 static char* lexGetQuotedPrintable()

 {

     int c;

     lexSkipWhite();

     c = lexLookahead();

     lexClearToken();

 

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

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

 	if (c == '\n') {

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

 	    break;

 	} else if (c == '=') {

 	    int cur = 0;

 	    int next;

 

 	    lexSkipLookahead(); // skip '='

@@ -1047,21 +1049,18 @@ static int yylex() {
 	    DBG_(("db: LINESEP\n"));

 	    return LINESEP;

 	    }

 	else {

 	    char *p = 0;

 	    lexPushLookaheadc(c);

 	    if (lexWithinMode(L_BASE64)) {

 		/* get each char and convert to bin on the fly... */

-		p = lexGetDataFromBase64();

-#if 0
-		yylval.str = p;

-		return STRING;

-#endif		
+		yylval.str = NULL;

+		return lexGetDataFromBase64() ? STRING : 0;

 		}

 	    else if (lexWithinMode(L_QUOTED_PRINTABLE)) {

 		p = lexGetQuotedPrintable();

 		}

 	    else {

 #ifdef _SUPPORT_LINE_FOLDING

 		p = lexGet1Value();

 #else

@@ -1233,17 +1232,17 @@ void mime_error(char *s)
 

 void mime_error_(char *s)

     {

     if (mimeErrorHandler) {

 	mimeErrorHandler(s);

 	}

     }

 

-#line 1240 "y.tab.c"
+#line 1241 "y.tab.c"
 #define YYABORT goto yyabort
 #define YYREJECT goto yyabort
 #define YYACCEPT goto yyaccept
 #define YYERROR goto yyerrlab
 int
 #if defined(__STDC__)
 yyparse(void)
 #else
@@ -1533,17 +1532,17 @@ case 44:
 break;
 case 45:
 #line 376 "backend/vcc.y"
 {

 	lexPopMode(0);

 	popVObject();

 	}
 break;
-#line 1540 "y.tab.c"
+#line 1541 "y.tab.c"
     }
     yyssp -= yym;
     yystate = *yyssp;
     yyvsp -= yym;
     yym = yylhs[yyn];
     if (yystate == 0 && yym == 0)
     {
 #if YYDEBUG
diff --git a/library/backend/vobject.cpp b/library/backend/vobject.cpp
index 4c8de70..9263c3a 100644
--- a/library/backend/vobject.cpp
+++ b/library/backend/vobject.cpp
@@ -37,19 +37,17 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 ***************************************************************************/
 
 /*
  * src: vobject.c
  * doc: vobject and APIs to construct vobject, APIs pretty print 
  * vobject, and convert a vobject into its textual representation.
  */
 
-#ifndef	 MWERKS
-#include <malloc.h>
-#endif
+#include <stdlib.h>
 
 #include <qtopia/config.h>
 #include "vobject_p.h"
 #include "qfiledirect_p.h"
 #include <string.h>
 #include <stdio.h>
 #include <fcntl.h>
 //#include <io.h>
@@ -752,17 +750,16 @@ static struct PreDefProp propNames[] = {
     { VCPriorityProp, 0, 0, 0 },
     { VCProcedureNameProp, 0, 0, 0 },
     { VCProdIdProp, 0, 0, 0 },
     { VCProdigyProp, 0, 0, 0 },
     { VCPronunciationProp, 0, 0, 0 },
     { VCPSProp, 0, 0, 0 },
     { VCPublicKeyProp, 0, 0, 0 },
     { VCQPProp, VCQuotedPrintableProp, 0, 0 },
-    { VCQPProp, VCBase64Prop, 0, 0 },
     { VCQuickTimeProp, 0, 0, 0 },
     { VCQuotedPrintableProp, 0, 0, 0 },
     { VCRDateProp, 0, 0, 0 },
     { VCRegionProp, 0, 0, 0 },
     { VCRelatedToProp, 0, 0, 0 },
     { VCRepeatCountProp, 0, 0, 0 },
     { VCResourcesProp, 0, 0, 0 },
     { VCRNumProp, 0, 0, 0 },
diff --git a/library/backend/vobject_p.h b/library/backend/vobject_p.h
index f969898..3c9d0d3 100644
--- a/library/backend/vobject_p.h
+++ b/library/backend/vobject_p.h
@@ -94,19 +94,17 @@ For example:
   CLIPFORMAT foo = RegisterClipboardFormat(vCardClipboardFormat);
 
 */
 
 #define vCardMimeType		"text/x-vCard"
 #define vCalendarMimeType	"text/x-vCalendar"
 
 #undef DLLEXPORT
-	//#include <qtopia/qpeglobal.h>
-#include <qglobal.h>
-
+#include <qtopia/global.h>
 #if defined(QTOPIA_MAKEDLL)
 #define DLLEXPORT(t)   __declspec(dllexport) t
 #elif defined(QTOPIA_DLL)
 #define DLLEXPORT(t)   __declspec(dllimport) t
 #else
 #define DLLEXPORT(t) t
 #endif