projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
send fix signed of length variable
[mmh]
/
sbr
/
fmt_rfc2047.c
diff --git
a/sbr/fmt_rfc2047.c
b/sbr/fmt_rfc2047.c
index
faa3cc2
..
687ea57
100644
(file)
--- a/
sbr/fmt_rfc2047.c
+++ b/
sbr/fmt_rfc2047.c
@@
-209,7
+209,7
@@
decode_rfc2047(char *str, char *dst, size_t dstlen)
if (use_iconv) {
saveq = q;
savedstlen = dstlen;
if (use_iconv) {
saveq = q;
savedstlen = dstlen;
- q = convbuf = (char *) mh_xmalloc(endofmime - startofmime);
+ q = convbuf = mh_xcalloc(endofmime - startofmime, sizeof(char));
}
/*
** ADDCHR2 is for adding characters when q is or might be convbuf:
}
/*
** ADDCHR2 is for adding characters when q is or might be convbuf:
@@
-318,8
+318,12
@@
decode_rfc2047(char *str, char *dst, size_t dstlen)
break;
/* skip to next input character */
if (fromutf8) {
break;
/* skip to next input character */
if (fromutf8) {
- for (start++;(start < q) && ((*start & 192) == 128);start++)
+ inbytes--;
+ start++;
+ while ((start < q) && ((*start & 192) == 128)) {
+ start++;
inbytes--;
inbytes--;
+ }
} else
start++, inbytes--;
if (start >= q)
} else
start++, inbytes--;
if (start >= q)
@@
-337,7
+341,7
@@
decode_rfc2047(char *str, char *dst, size_t dstlen)
if (!dstlen || !savedstlen)
goto buffull;
dstlen = savedstlen;
if (!dstlen || !savedstlen)
goto buffull;
dstlen = savedstlen;
- free(convbuf);
+ mh_free0(&convbuf);
}
#endif
}
#endif