Fix last commit. Oops.

diff --git a/ext/repo_updateinfoxml.c b/ext/repo_updateinfoxml.c
index b7c91043242ba6f46d4323525129472ec369de95..ff84d32122814b3476d5bf5896067d9ac546d490 100644 (file)
--- a/ext/repo_updateinfoxml.c
+++ b/ext/repo_updateinfoxml.c
@@ -441,7 +441,7 @@ repo_add_updateinfoxml(Repo *repo, FILE *fp, int flags)
   pd.repo = repo;
   pd.data = data;
   solv_xmlparser_init(&pd.xmlp, stateswitches, &pd, startElement, endElement);
-  solv_xmlparser_parse(&pd.xmlp, fp);
+  if (solv_xmlparser_parse(&pd.xmlp, fp) != SOLV_XMLPARSER_OK)
     pd.ret = pool_error(pool, -1, "repo_updateinfoxml: %s at line %u:%u", pd.xmlp.errstr, pd.xmlp.line, pd.xmlp.column);
   solv_xmlparser_free(&pd.xmlp);
   join_freemem(&pd.jd);

diff --git a/ext/solv_xmlparser.c b/ext/solv_xmlparser.c
index a23f4750df61903488c139cf01b8b1b2ac25c0bc..6292663cbafd230428444c9889ae8332be6b69de 100644 (file)
--- a/ext/solv_xmlparser.c
+++ b/ext/solv_xmlparser.c
@@ -308,11 +308,13 @@ solv_xmlparser_parse(struct solv_xmlparser *xmlp, FILE *fp)
   for (;;)
     {
       l = fread(buf, 1, sizeof(buf), fp);
-      if (!parse_block(xmlp, buf, l) || !l)
+      if (!parse_block(xmlp, buf, l))
        {
          ret = SOLV_XMLPARSER_ERROR;
          break;
        }
+      if (!l)
+       break;
     }
   free_parser(xmlp);
   return ret;