delete broken solvables if the xml parser returns an error

openSUSE · Mar 5, 2014 · 147d0dd · 147d0dd
1 parent e67081c
commit 147d0dd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/ext/repo_appdata.c b/ext/repo_appdata.c
@@ -511,7 +511,12 @@ repo_add_appdata(Repo *repo, FILE *fp, int flags)
       l = fread(buf, 1, sizeof(buf), fp);
       if (XML_Parse(parser, buf, l, l == 0) == XML_STATUS_ERROR)
 	{
-          pool_error(pool, -1, "repo_appdata: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
+	  pool_error(pool, -1, "repo_appdata: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
+	  if (pd.solvable)
+	    {
+	      repo_free_solvable(repo, pd.solvable - pd.pool->solvables, 1);
+	      pd.solvable = 0;
+	    }
 	  ret = -1;
 	  break;
 	}

diff --git a/ext/repo_products.c b/ext/repo_products.c
@@ -451,8 +451,12 @@ add_code11_product(struct parsedata *pd, FILE *fp)
       if (XML_Parse(parser, buf, l, l == 0) == XML_STATUS_ERROR)
 	{
 	  pool_debug(pd->pool, SOLV_ERROR, "%s: %s at line %u:%u\n", pd->filename, XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
-	  pool_debug(pd->pool, SOLV_ERROR, "skipping this product\n");
 	  XML_ParserFree(parser);
+	  if (pd->solvable)
+	    {
+	      repo_free_solvable(pd->repo, pd->solvable - pd->pool->solvables, 1);
+	      pd->solvable = 0;
+	    }
 	  return;
 	}
       if (l == 0)

diff --git a/ext/repo_zyppdb.c b/ext/repo_zyppdb.c
@@ -290,6 +290,11 @@ add_zyppdb_product(struct parsedata *pd, FILE *fp)
       if (XML_Parse(parser, buf, l, l == 0) == XML_STATUS_ERROR)
 	{
 	  pool_debug(pd->pool, SOLV_ERROR, "repo_zyppdb: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
+	  if (pd->solvable)
+	    {
+	      repo_free_solvable(pd->repo, pd->solvable - pd->pool->solvables, 1);
+	      pd->solvable = 0;
+	    }
 	  return;
 	}
       if (l == 0)