diff options
Diffstat (limited to 'mailinfo.c')
| -rw-r--r-- | mailinfo.c | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/mailinfo.c b/mailinfo.c index d1f42bd7e3..b4e815b2d8 100644 --- a/mailinfo.c +++ b/mailinfo.c @@ -1,4 +1,4 @@ -#define USE_THE_REPOSITORY_VARIABLE +#define DISABLE_SIGN_COMPARE_WARNINGS #include "git-compat-util.h" #include "config.h" @@ -266,6 +266,8 @@ static void handle_content_type(struct mailinfo *mi, struct strbuf *line) error("Too many boundaries to handle"); mi->input_error = -1; mi->content_top = &mi->content[MAX_BOUNDARIES] - 1; + strbuf_release(boundary); + free(boundary); return; } *(mi->content_top) = boundary; @@ -381,12 +383,12 @@ static int is_format_patch_separator(const char *line, int len) return !memcmp(SAMPLE + (cp - line), cp, strlen(SAMPLE) - (cp - line)); } -static struct strbuf *decode_q_segment(const struct strbuf *q_seg, int rfc2047) +static int decode_q_segment(struct strbuf *out, const struct strbuf *q_seg, + int rfc2047) { const char *in = q_seg->buf; int c; - struct strbuf *out = xmalloc(sizeof(struct strbuf)); - strbuf_init(out, q_seg->len); + strbuf_grow(out, q_seg->len); while ((c = *in++) != 0) { if (c == '=') { @@ -405,16 +407,15 @@ static struct strbuf *decode_q_segment(const struct strbuf *q_seg, int rfc2047) c = 0x20; strbuf_addch(out, c); } - return out; + return 0; } -static struct strbuf *decode_b_segment(const struct strbuf *b_seg) +static int decode_b_segment(struct strbuf *out, const struct strbuf *b_seg) { /* Decode in..ep, possibly in-place to ot */ int c, pos = 0, acc = 0; const char *in = b_seg->buf; - struct strbuf *out = xmalloc(sizeof(struct strbuf)); - strbuf_init(out, b_seg->len); + strbuf_grow(out, b_seg->len); while ((c = *in++) != 0) { if (c == '+') @@ -447,7 +448,7 @@ static struct strbuf *decode_b_segment(const struct strbuf *b_seg) break; } } - return out; + return 0; } static int convert_to_utf8(struct mailinfo *mi, @@ -475,7 +476,7 @@ static int convert_to_utf8(struct mailinfo *mi, static void decode_header(struct mailinfo *mi, struct strbuf *it) { char *in, *ep, *cp; - struct strbuf outbuf = STRBUF_INIT, *dec; + struct strbuf outbuf = STRBUF_INIT, dec = STRBUF_INIT; struct strbuf charset_q = STRBUF_INIT, piecebuf = STRBUF_INIT; int found_error = 1; /* pessimism */ @@ -530,18 +531,19 @@ static void decode_header(struct mailinfo *mi, struct strbuf *it) default: goto release_return; case 'b': - dec = decode_b_segment(&piecebuf); + if ((found_error = decode_b_segment(&dec, &piecebuf))) + goto release_return; break; case 'q': - dec = decode_q_segment(&piecebuf, 1); + if ((found_error = decode_q_segment(&dec, &piecebuf, 1))) + goto release_return; break; } - if (convert_to_utf8(mi, dec, charset_q.buf)) + if (convert_to_utf8(mi, &dec, charset_q.buf)) goto release_return; - strbuf_addbuf(&outbuf, dec); - strbuf_release(dec); - free(dec); + strbuf_addbuf(&outbuf, &dec); + strbuf_release(&dec); in = ep + 2; } strbuf_addstr(&outbuf, in); @@ -552,6 +554,7 @@ release_return: strbuf_release(&outbuf); strbuf_release(&charset_q); strbuf_release(&piecebuf); + strbuf_release(&dec); if (found_error) mi->input_error = -1; @@ -634,23 +637,22 @@ static int is_inbody_header(const struct mailinfo *mi, static void decode_transfer_encoding(struct mailinfo *mi, struct strbuf *line) { - struct strbuf *ret; + struct strbuf ret = STRBUF_INIT; switch (mi->transfer_encoding) { case TE_QP: - ret = decode_q_segment(line, 0); + decode_q_segment(&ret, line, 0); break; case TE_BASE64: - ret = decode_b_segment(line); + decode_b_segment(&ret, line); break; case TE_DONTCARE: default: return; } strbuf_reset(line); - strbuf_addbuf(line, ret); - strbuf_release(ret); - free(ret); + strbuf_addbuf(line, &ret); + strbuf_release(&ret); } static inline int patchbreak(const struct strbuf *line) @@ -1268,7 +1270,7 @@ static int git_mailinfo_config(const char *var, const char *value, return 0; } -void setup_mailinfo(struct mailinfo *mi) +void setup_mailinfo(struct repository *r, struct mailinfo *mi) { memset(mi, 0, sizeof(*mi)); strbuf_init(&mi->name, 0); @@ -1280,7 +1282,7 @@ void setup_mailinfo(struct mailinfo *mi) mi->header_stage = 1; mi->use_inbody_headers = 1; mi->content_top = mi->content; - git_config(git_mailinfo_config, mi); + repo_config(r, git_mailinfo_config, mi); } void clear_mailinfo(struct mailinfo *mi) |