unsigned char *q;
q = data;
- for (p = str; *p && (*p == '=' || strchr(base64_chars, *p)); p += 4) {
+ p = str;
+
+ while (*p && *p && (*p == '=' || strchr(base64_chars, *p))) {
unsigned int val = token_decode(p);
unsigned int marker = (val >> 24) & 0xff;
if (val == DECODE_ERROR)
*q++ = (val >> 8) & 0xff;
if (marker < 1)
*q++ = val & 0xff;
+ p += 4;
+ if (*p == '\n')
+ p++;
}
return q - (unsigned char *) data;
}
int
base64Valid(const char *str)
{
- const char *p;
+ const char *p = str;
int valid = 1;
- for (p = str; *p && (*p == '=' || strchr(base64_chars, *p)); p += 4) {
+ while (*p && *p && (*p == '=' || strchr(base64_chars, *p))) {
unsigned int val = token_decode(p);
if (val == DECODE_ERROR) {
valid = 0;
break;
}
+ p += 4;
+ if (*p == '\n')
+ p++;
}
return valid;
}