diff options
| author | Michael Vogt <mvo@debian.org> | 2013-07-02 08:32:34 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-07-02 08:32:34 +0200 |
| commit | 8e4c3f0a42664b8c37cc2e0de285849fbf118e11 (patch) | |
| tree | 059b76fef1c1636a7e1ad16e5a4ce06304271718 /apt-inst | |
| parent | 25a4d2049fb79bc2c86cd45e977b4a071e5300ac (diff) | |
| parent | e3c62328abbd548bb0da42fdbad954b3ce4f7102 (diff) | |
Merge remote-tracking branch 'donkult/debian/sid' into debian/sid
Conflicts:
debian/changelog
Diffstat (limited to 'apt-inst')
| -rw-r--r-- | apt-inst/contrib/arfile.cc | 3 | ||||
| -rw-r--r-- | apt-inst/contrib/extracttar.cc | 1 | ||||
| -rw-r--r-- | apt-inst/makefile | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc index 2dee1a40d..d7ee528ba 100644 --- a/apt-inst/contrib/arfile.cc +++ b/apt-inst/contrib/arfile.cc @@ -106,7 +106,10 @@ bool ARArchive::LoadHeaders() return _error->Error(_("Invalid archive member header")); } if (File.Read(S,Len) == false) + { + delete Memb; return false; + } S[Len] = 0; Memb->Name = S; Memb->Size -= Len; diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index 806ba796d..49ed5db56 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -63,7 +63,6 @@ ExtractTar::ExtractTar(FileFd &Fd,unsigned long Max,string DecompressionProgram) { GZPid = -1; - InFd = -1; Eof = false; } /*}}}*/ diff --git a/apt-inst/makefile b/apt-inst/makefile index cfb22741a..da983df5f 100644 --- a/apt-inst/makefile +++ b/apt-inst/makefile @@ -18,6 +18,7 @@ MAJOR=1.5 MINOR=0 SLIBS=$(PTHREADLIB) -lapt-pkg APT_DOMAIN:=libapt-inst$(MAJOR) +LIBRARYDEPENDS=$(LIB)/libapt-pkg.so # Source code for the contributed non-core things SOURCE = contrib/extracttar.cc contrib/arfile.cc |