Diffstat (limited to 'kmicromail/libetpan/mime/mailmime_decode.c') (more/less context) (show whitespace changes)
-rw-r--r-- | kmicromail/libetpan/mime/mailmime_decode.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/kmicromail/libetpan/mime/mailmime_decode.c b/kmicromail/libetpan/mime/mailmime_decode.c index 3025dcb..e48ec19 100644 --- a/kmicromail/libetpan/mime/mailmime_decode.c +++ b/kmicromail/libetpan/mime/mailmime_decode.c | |||
@@ -188,14 +188,24 @@ int mailmime_encoded_phrase_parse(const char * default_fromcode, | |||
188 | strlen(raw_word), &wordutf8); | 188 | strlen(raw_word), &wordutf8); |
189 | 189 | ||
190 | if (wordutf8 != NULL) { | 190 | switch (r) { |
191 | if (mmap_string_append(gphrase, wordutf8) == NULL) { | 191 | case MAIL_CHARCONV_ERROR_MEMORY: |
192 | free(wordutf8); | ||
193 | free(raw_word); | 192 | free(raw_word); |
194 | res = MAILIMF_ERROR_MEMORY; | 193 | res = MAILIMF_ERROR_MEMORY; |
195 | goto free; | 194 | goto free; |
195 | |||
196 | case MAIL_CHARCONV_ERROR_UNKNOWN_CHARSET: | ||
197 | case MAIL_CHARCONV_ERROR_CONV: | ||
198 | free(raw_word); | ||
199 | res = MAILIMF_ERROR_PARSE; | ||
200 | goto free; | ||
196 | } | 201 | } |
197 | 202 | ||
203 | if (mmap_string_append(gphrase, wordutf8) == NULL) { | ||
198 | free(wordutf8); | 204 | free(wordutf8); |
205 | free(raw_word); | ||
206 | res = MAILIMF_ERROR_MEMORY; | ||
207 | goto free; | ||
199 | } | 208 | } |
209 | |||
200 | free(raw_word); | 210 | free(raw_word); |
201 | first = FALSE; | 211 | first = FALSE; |