GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: Fix status parsing for decrypt + verify

Browse Source 
* src/decrypt.c (parse_status_error): Don't modify args.

--
Otherwise chained status handlers will not see the full args
which resulted in a parse error in the verify status handler.

GnuPG-Bug-Id: T3310
This commit is contained in:
Andre Heinecke 2017-07-27 14:20:58 +02:00
parent c7be41a5f8
commit d3796e4504
No known key found for this signature in database
GPG Key ID: 2978E9D40CBABA5C
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/decrypt.c
View File

@ -145,10 +145,18 @@ parse_status_error (char *args, op_data_t opd)
gpgme_error_t err; gpgme_error_t err;
char *field[3]; char *field[3];
int nfields; int nfields;
char *args2;
nfields = _gpgme_split_fields (args, field, DIM (field)); if (!args)
return trace_gpg_error (GPG_ERR_INV_ENGINE);
args2 = strdup (args); /* Split modifies the input string. */
nfields = _gpgme_split_fields (args2, field, DIM (field));
if (nfields < 1) if (nfields < 1)
return trace_gpg_error (GPG_ERR_INV_ENGINE); /* Required arg missing. */ {
free (args2);
return trace_gpg_error (GPG_ERR_INV_ENGINE); /* Required arg missing. */
}
err = nfields < 2 ? 0 : atoi (field[1]); err = nfields < 2 ? 0 : atoi (field[1]);
if (!strcmp (field[0], "decrypt.algorithm")) if (!strcmp (field[0], "decrypt.algorithm"))
@ -159,7 +167,10 @@ parse_status_error (char *args, op_data_t opd)
{ {
opd->result.unsupported_algorithm = strdup (field[2]); opd->result.unsupported_algorithm = strdup (field[2]);
if (!opd->result.unsupported_algorithm) if (!opd->result.unsupported_algorithm)
return gpg_error_from_syserror (); {
free (args2);
return gpg_error_from_syserror ();
}
} }
} }
else if (!strcmp (field[0], "decrypt.keyusage")) else if (!strcmp (field[0], "decrypt.keyusage"))
@ -193,6 +204,7 @@ parse_status_error (char *args, op_data_t opd)
} }
free (args2);
return 0; return 0;
} }