From: Michael Schroeder <mls@suse.de>
Date: Wed, 31 Mar 2021 11:46:16 +0000 (+0200)
Subject: Change calloc/realloc calls to solv_calloc/solv_realloc
X-Git-Tag: 0.7.19~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d52e359003397bbbeef89ea9145481d0e33191c7;p=thirdparty%2Flibsolv.git

Change calloc/realloc calls to solv_calloc/solv_realloc

Spotted by Jaroslav Rohel, thanks!
---

diff --git a/ext/repo_appdata.c b/ext/repo_appdata.c
index b798af4c..390b286d 100644
--- a/ext/repo_appdata.c
+++ b/ext/repo_appdata.c
@@ -183,7 +183,7 @@ indent(struct parsedata *pd, int il)
       if (xmlp->lcontent + il + 1 > xmlp->acontent)
 	{
 	  xmlp->acontent = xmlp->lcontent + il + 256;
-	  xmlp->content = realloc(xmlp->content, xmlp->acontent);
+	  xmlp->content = solv_realloc(xmlp->content, xmlp->acontent);
 	}
       memmove(xmlp->content + l + il, xmlp->content + l, xmlp->lcontent - l + 1);
       for (i = 0; i < il; i++)
diff --git a/ext/repo_helix.c b/ext/repo_helix.c
index 37359bbf..f4bea55e 100644
--- a/ext/repo_helix.c
+++ b/ext/repo_helix.c
@@ -655,7 +655,7 @@ endElement(struct solv_xmlparser *xmlp, int state, char *content)
       if (xmlp->lcontent + 1 + pd->levrspace > pd->aevrspace)
 	{
 	  pd->aevrspace = xmlp->lcontent + 1 + pd->levrspace + 256;
-	  pd->evrspace = (char *)realloc(pd->evrspace, pd->aevrspace);
+	  pd->evrspace = (char *)solv_realloc(pd->evrspace, pd->aevrspace);
 	}
       memcpy(pd->evrspace + pd->levrspace, xmlp->content, xmlp->lcontent + 1);
       if (state == STATE_EPOCH)
diff --git a/ext/solv_xfopen.c b/ext/solv_xfopen.c
index 7e974a91..b3136cbb 100644
--- a/ext/solv_xfopen.c
+++ b/ext/solv_xfopen.c
@@ -182,12 +182,7 @@ static LZFILE *lzopen(const char *path, const char *mode, int fd, int isxz)
     fp = fopen(path, encoding ? "w" : "r");
   if (!fp)
     return 0;
-  lzfile = calloc(1, sizeof(*lzfile));
-  if (!lzfile)
-    {
-      fclose(fp);
-      return 0;
-    }
+  lzfile = solv_calloc(1, sizeof(*lzfile));
   lzfile->file = fp;
   lzfile->encoding = encoding;
   lzfile->eof = 0;
diff --git a/src/repo_write.c b/src/repo_write.c
index 0f9fc4fd..af4e7599 100644
--- a/src/repo_write.c
+++ b/src/repo_write.c
@@ -1446,7 +1446,7 @@ for (i = 1; i < target.nkeys; i++)
       reloff += 3 * target.nkeys;
     }
 
-  needid = calloc(reloff + pool->nrels, sizeof(*needid));
+  needid = solv_calloc(reloff + pool->nrels, sizeof(*needid));
   needid[0].map = reloff;	/* remember size in case we need to grow */
 
   cbdata.needid = needid;