From e6cb76ded3e81ac75726ba03d0cfd00e7f8c733c Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 27 Jun 2007 23:01:52 +0000 Subject: [PATCH] Applied fix for crash when setting window properties in single-byte character encodings. This was posted by Nedko Arnaudov on the ion mailing list. --- debian/patches/00list | 1 + debian/patches/102_fix-string-list-crash.diff | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 debian/patches/102_fix-string-list-crash.diff diff --git a/debian/patches/00list b/debian/patches/00list index 24d4144..56ccaf0 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,3 +1,4 @@ +102_fix-string-list-crash.diff 201_fix-paths.diff 202_fix-menus.diff 204_fix-bindings.diff diff --git a/debian/patches/102_fix-string-list-crash.diff b/debian/patches/102_fix-string-list-crash.diff new file mode 100644 index 0000000..89e31db --- /dev/null +++ b/debian/patches/102_fix-string-list-crash.diff @@ -0,0 +1,30 @@ +#! /bin/sh -e +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +# Patch thanks to Nedko Arnaudov + +diff -ru ion-3rc-20070608/ioncore/property.c ion-3rc-20070608.fixed/ioncore/property.c +--- ion-3rc-20070608/ioncore/property.c 2007-06-08 19:56:51.000000000 +0300 ++++ ion-3rc-20070608.fixed/ioncore/property.c 2007-06-18 16:32:11.000000000 +0300 +@@ -213,7 +213,7 @@ + Status st; + + if(!ioncore_g.use_mb){ +- st=XStringListToTextProperty((char **)&ptr, n, &prop); ++ st=XStringListToTextProperty((char **)ptr, n, &prop); + }else{ + st=XmbTextListToTextProperty(ioncore_g.dpy, (char **)ptr, n, + XTextStyle, &prop); -- 2.39.2