aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2007-07-26 01:58:11 +0000
committerJason Woodward2007-07-26 01:58:11 +0000
commit4796847211e396baca935cee34cd5a9e75714fb4 (patch)
tree87b111e4bda3aa70405cdcd2269ddf27614ec504
parent9f4de08fafacc495bbc383674f43fc305510a751 (diff)
downloadslapt-get-4796847211e396baca935cee34cd5a9e75714fb4.tar.gz
bug fix for segfault if gpg verification fails for an uncompressed checksums file. Thanks to QliXed.
-rw-r--r--ChangeLog4
-rw-r--r--Makefile2
-rw-r--r--slack-desc2
-rw-r--r--src/package.c8
4 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e4f2a51..3729e51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
+0.9.12a Jul 25, 2007
+ * bug fix for segfault if gpg verification fails for an uncompressed
+ checksums file. Thanks to QliXed.
+
0.9.12 Jul 10, 2007
* updated doc/libslapt.3 manpage
* russian an ukrainian updates from sin
diff --git a/Makefile b/Makefile
index 34fd744..a35655d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
PACKAGE=slapt-get
-VERSION=0.9.12
+VERSION=0.9.12a
ARCH=$(shell uname -m | sed -e "s/i[3456]86/i386/")
LIBDIR=/usr/lib
RELEASE=1
diff --git a/slack-desc b/slack-desc
index 1bc5902..1f4ff30 100644
--- a/slack-desc
+++ b/slack-desc
@@ -9,7 +9,7 @@
slapt-get: slapt-get (APT like system for Slackware)
slapt-get: slapt-get is an APT like system for Slackware package management.
slapt-get:
-slapt-get: * See /usr/doc/slapt-get-0.9.12/ for complete documentation.
+slapt-get: * See /usr/doc/slapt-get-0.9.12a/ for complete documentation.
slapt-get: * You will also want to customize /etc/slapt-get/slapt-getrc,
slapt-get: using a local mirror. www.slackware.com may be very busy.
slapt-get: * Support:
diff --git a/src/package.c b/src/package.c
index 8fb7d1c..b2da751 100644
--- a/src/package.c
+++ b/src/package.c
@@ -2080,10 +2080,12 @@ int slapt_update_pkg_cache(const slapt_rc_config *global_config)
fclose(tmp_signature_f);
/* if we opened the raw gzipped checksums, close it here */
- if (compressed == 1)
+ if (compressed == 1) {
fclose(tmp_checksum_to_verify_f);
- else
- rewind(tmp_checksum_f);
+ } else {
+ if (tmp_checksum_f)
+ rewind(tmp_checksum_f);
+ }
#endif
if (source_dl_failed != 1) {