1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-09 23:39:51 +02:00

common: Don't continuing processing on error.

* g10/parse-packet.c (dbg_parse_packet): Also return if parse returns
an error.
(parse_packet): Likewise.
(dbg_search_packet): Likewise.
(search_packet): Likewise.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>.
This commit is contained in:
Neal H. Walfield 2015-08-21 09:32:58 +02:00
parent 73af66a0aa
commit 48e792cc95

View File

@ -272,7 +272,7 @@ dbg_parse_packet (IOBUF inp, PACKET *pkt, const char *dbg_f, int dbg_l)
{ {
rc = parse (inp, pkt, 0, NULL, &skip, NULL, 0, "parse", dbg_f, dbg_l); rc = parse (inp, pkt, 0, NULL, &skip, NULL, 0, "parse", dbg_f, dbg_l);
} }
while (skip); while (skip && ! rc);
return rc; return rc;
} }
#else /*!DEBUG_PARSE_PACKET*/ #else /*!DEBUG_PARSE_PACKET*/
@ -285,7 +285,7 @@ parse_packet (IOBUF inp, PACKET * pkt)
{ {
rc = parse (inp, pkt, 0, NULL, &skip, NULL, 0); rc = parse (inp, pkt, 0, NULL, &skip, NULL, 0);
} }
while (skip); while (skip && ! rc);
return rc; return rc;
} }
#endif /*!DEBUG_PARSE_PACKET*/ #endif /*!DEBUG_PARSE_PACKET*/
@ -308,7 +308,7 @@ dbg_search_packet (IOBUF inp, PACKET * pkt, off_t * retpos, int with_uid,
parse (inp, pkt, with_uid ? 2 : 1, retpos, &skip, NULL, 0, "search", parse (inp, pkt, with_uid ? 2 : 1, retpos, &skip, NULL, 0, "search",
dbg_f, dbg_l); dbg_f, dbg_l);
} }
while (skip); while (skip && ! rc);
return rc; return rc;
} }
#else /*!DEBUG_PARSE_PACKET*/ #else /*!DEBUG_PARSE_PACKET*/
@ -321,7 +321,7 @@ search_packet (IOBUF inp, PACKET * pkt, off_t * retpos, int with_uid)
{ {
rc = parse (inp, pkt, with_uid ? 2 : 1, retpos, &skip, NULL, 0); rc = parse (inp, pkt, with_uid ? 2 : 1, retpos, &skip, NULL, 0);
} }
while (skip); while (skip && ! rc);
return rc; return rc;
} }
#endif /*!DEBUG_PARSE_PACKET*/ #endif /*!DEBUG_PARSE_PACKET*/