From 4c65eaf4a1e9692f48d680a366e2fa91cca0a116 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sun, 1 Jun 2014 01:11:19 +0200 Subject: dpkg: Remove static from pointer variables These were supposedly static to cater to the push_cleanup() needs, but as these are pointers they are unaffected by an unrolled stack. --- src/unpack.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/unpack.c') diff --git a/src/unpack.c b/src/unpack.c index 851c358c6..591573678 100644 --- a/src/unpack.c +++ b/src/unpack.c @@ -409,8 +409,6 @@ void process_archive(const char *filename) { * we unwind the stack before processing the cleanup list, and these * variables had better still exist ... */ static int p1[2]; - static char *cidir = NULL; - static struct fileinlist *newconffiles, *newfileslist; static enum pkgstatus oldversionstatus; static struct varbuf depprobwhy; static struct tarcontext tc; @@ -422,10 +420,13 @@ void process_archive(const char *filename) { struct pkgiterator *it; struct pkginfo *pkg, *otherpkg; struct pkg_list *conflictor_iter; + char *cidir = NULL; char *cidirrest, *p; char conffilenamebuf[MAXCONFFILENAME]; char *psize; const char *pfilename; + struct fileinlist *newfileslist; + struct fileinlist *newconffiles; struct fileinlist *newconff, **newconffileslastp; struct fileinlist *cfile; struct reversefilelistiter rlistit; -- cgit v1.2.3