[SCM] dpkg's main repository branch, master, updated. 1.15.8.5-132-gf0266cd

[Guillem Jover]

The following commit has been merged in the master branch:
commit 4afef203d5ae2eb54d6c8f4bd5ff016a98bf7ffc
Author: Guillem Jover <guil...@debian.org>
Date:   Wed Oct 6 11:36:04 2010 +0200

    libdpkg: Do not use m_malloc in push_checkpoint
    
    This avoids a cyclic dependency between ehandle.c and m_lib.c.

diff --git a/lib/dpkg/ehandle.c b/lib/dpkg/ehandle.c
index 0734c73..84838b7 100644
--- a/lib/dpkg/ehandle.c
+++ b/lib/dpkg/ehandle.c
@@ -187,7 +187,12 @@ void push_checkpoint(int mask, int value) {
   struct cleanupentry *cep;
   int i;
   
-  cep= m_malloc(sizeof(struct cleanupentry) + sizeof(char*));
+  cep = malloc(sizeof(struct cleanupentry) + sizeof(char *));
+  if (cep == NULL) {
+    onerr_abort++;
+    ohshite(_("out of memory for new cleanup entry"));
+  }
+
   for (i=0; i<NCALLS; i++) { cep->calls[i].call=NULL; cep->calls[i].mask=0; }
   cep->cpmask= mask; cep->cpvalue= value;
   cep->argc= 0; cep->argv[0]= NULL;

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org