[SCM] libindi packaging branch, master, updated. debian/0.9.1-2-2-gac9acd9

Maximiliano Curia maxy at alioth.debian.org
Mon Jul 1 15:03:42 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/libindi.git;a=commitdiff;h=1045bfd

The following commit has been merged in the master branch:
commit 1045bfd0b1ceda55c0b427169245cb4f303579e7
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Jul 1 17:02:06 2013 +0200

    New patch: setINDIproperty_mayhem_fix.diff fix for http://www.forallsecure.com/bug-reports/f7467b92bdec47c7d8213b93db76f57e58e97215/
---
 debian/changelog                               |    8 ++++++++
 debian/patches/series                          |    1 +
 debian/patches/setINDIproperty_mayhem_fix.diff |   24 ++++++++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cd9f41f..bbd732e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libindi (0.9.1-3) UNRELEASED; urgency=low
+
+  * New patch: setINDIproperty_mayhem_fix.diff fix for
+    http://www.forallsecure.com/bug-
+    reports/f7467b92bdec47c7d8213b93db76f57e58e97215/
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 01 Jul 2013 17:00:53 +0200
+
 libindi (0.9.1-2) unstable; urgency=low
 
   * Release to unstable.
diff --git a/debian/patches/series b/debian/patches/series
index 841b4bd..8284511 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 abi.diff
 libdir.diff
+setINDIproperty_mayhem_fix.diff
diff --git a/debian/patches/setINDIproperty_mayhem_fix.diff b/debian/patches/setINDIproperty_mayhem_fix.diff
new file mode 100644
index 0000000..b9ac11f
--- /dev/null
+++ b/debian/patches/setINDIproperty_mayhem_fix.diff
@@ -0,0 +1,24 @@
+diff --git a/tools/setINDIproperty.c b/tools/setINDIproperty.c
+index 25ae44c..0ce02e0 100644
+--- a/tools/setINDIproperty.c
++++ b/tools/setINDIproperty.c
+@@ -243,7 +243,7 @@ crackSpec (int *acp, char **avp[])
+ 	INDIDef *dp = NULL;
+ 
+ 	/* check if first arg is type indicator */
+-	if (spec[0] == '-') {
++	if ((*acp > 0) && (spec[0] == '-')) {
+ 	    switch (spec[1]) {
+ 	    case 'x':	dp = &defs[0]; break;
+ 	    case 'n':	dp = &defs[1]; break;
+@@ -256,6 +256,10 @@ crackSpec (int *acp, char **avp[])
+ 	    (*avp)++;
+ 	    spec = *avp[0];
+ 	}
++        if (*acp <= 0) {
++            fprintf (stderr, "Missing spec
");
++            usage();
++        }
+ 
+ 	/* then scan arg for property spec */
+ 	if (sscanf (spec, "%[^.].%[^.].%s", d, p, ev) != 3) {

-- 
libindi packaging



More information about the pkg-kde-commits mailing list