security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-06-15 18:41:03 +02:00
Code Activity

gpg: Cleanup error code path in case of a bad trustdb.

Browse Source 
* g10/tdbio.c (tdbio_read_record): Fix returning of the error.
--

Actually the returned error will anyway be GPG_ERR_TRUSTDB but the old
code was not correct.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-06-04 17:39:55 +02:00
parent bf06d04f53
commit f170240ef7
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g10/tdbio.c
View File

@ -1487,8 +1487,9 @@ tdbio_read_record (ulong recnum, TRUSTREC *rec, int expected)
{ {
log_error (_("%s: not a trustdb file\n"), db_name ); log_error (_("%s: not a trustdb file\n"), db_name );
err = gpg_error (GPG_ERR_TRUSTDB); err = gpg_error (GPG_ERR_TRUSTDB);
/* FIXME ^ */
} }
else
{
p += 2; /* skip "gpg" */ p += 2; /* skip "gpg" */
rec->r.ver.version = *p++; rec->r.ver.version = *p++;
rec->r.ver.marginals = *p++; rec->r.ver.marginals = *p++;
@ -1516,6 +1517,7 @@ tdbio_read_record (ulong recnum, TRUSTREC *rec, int expected)
rec->r.ver.version ); rec->r.ver.version );
err = gpg_error (GPG_ERR_TRUSTDB); err = gpg_error (GPG_ERR_TRUSTDB);
} }
}
break; break;
case RECTYPE_FREE: case RECTYPE_FREE: