mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'rs/imap-send-next-arg-fix'
Error checking in "git imap-send" for empty response has been improved. * rs/imap-send-next-arg-fix: imap-send: handle missing response codes gracefully imap-send: handle NULL return of next_arg()
This commit is contained in:
commit
d4a5de7bde
15
imap-send.c
15
imap-send.c
|
@ -684,7 +684,7 @@ static int parse_response_code(struct imap_store *ctx, struct imap_cmd_cb *cb,
|
|||
struct imap *imap = ctx->imap;
|
||||
char *arg, *p;
|
||||
|
||||
if (*s != '[')
|
||||
if (!s || *s != '[')
|
||||
return RESP_OK; /* no response code */
|
||||
s++;
|
||||
if (!(p = strchr(s, ']'))) {
|
||||
|
@ -693,6 +693,10 @@ static int parse_response_code(struct imap_store *ctx, struct imap_cmd_cb *cb,
|
|||
}
|
||||
*p++ = 0;
|
||||
arg = next_arg(&s);
|
||||
if (!arg) {
|
||||
fprintf(stderr, "IMAP error: empty response code\n");
|
||||
return RESP_BAD;
|
||||
}
|
||||
if (!strcmp("UIDVALIDITY", arg)) {
|
||||
if (!(arg = next_arg(&s)) || !(ctx->uidvalidity = atoi(arg))) {
|
||||
fprintf(stderr, "IMAP error: malformed UIDVALIDITY status\n");
|
||||
|
@ -725,7 +729,8 @@ static int get_cmd_result(struct imap_store *ctx, struct imap_cmd *tcmd)
|
|||
{
|
||||
struct imap *imap = ctx->imap;
|
||||
struct imap_cmd *cmdp, **pcmdp;
|
||||
char *cmd, *arg, *arg1;
|
||||
char *cmd;
|
||||
const char *arg, *arg1;
|
||||
int n, resp, resp2, tag;
|
||||
|
||||
for (;;) {
|
||||
|
@ -733,6 +738,10 @@ static int get_cmd_result(struct imap_store *ctx, struct imap_cmd *tcmd)
|
|||
return RESP_BAD;
|
||||
|
||||
arg = next_arg(&cmd);
|
||||
if (!arg) {
|
||||
fprintf(stderr, "IMAP error: empty response\n");
|
||||
return RESP_BAD;
|
||||
}
|
||||
if (*arg == '*') {
|
||||
arg = next_arg(&cmd);
|
||||
if (!arg) {
|
||||
|
@ -807,6 +816,8 @@ static int get_cmd_result(struct imap_store *ctx, struct imap_cmd *tcmd)
|
|||
if (cmdp->cb.cont || cmdp->cb.data)
|
||||
imap->literal_pending = 0;
|
||||
arg = next_arg(&cmd);
|
||||
if (!arg)
|
||||
arg = "";
|
||||
if (!strcmp("OK", arg))
|
||||
resp = DRV_OK;
|
||||
else {
|
||||
|
|
Loading…
Reference in a new issue