From 9c09ca6f4db711cc15265b31c2802f2fec66a1f5d9f7468b0562930db0e0f919 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 20 Jun 2007 17:15:02 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ksh?expand=0&rev=7 --- ksh.changes | 5 +++++ ksh.spec | 4 +++- ksh93-shift_ijs.dif | 15 +++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ksh.changes b/ksh.changes index 4c077bb..0f40901 100644 --- a/ksh.changes +++ b/ksh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 20 15:15:28 CEST 2007 - werner@suse.de + +- Fix pointer arithmetics within sh_trim() (bug #284611) + ------------------------------------------------------------------- Tue Jun 19 16:01:40 CEST 2007 - werner@suse.de diff --git a/ksh.spec b/ksh.spec index e87845b..e600c74 100644 --- a/ksh.spec +++ b/ksh.spec @@ -18,7 +18,7 @@ Group: System/Shells PreReq: /bin/ln /etc/bash.bashrc /bin/true Autoreqprov: on Version: 93s -Release: 23 +Release: 24 Summary: Korn Shell BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: INIT.2007-03-28.tar.bz2 @@ -278,6 +278,8 @@ fi %{_includedir}/ast/ %changelog +* Wed Jun 20 2007 - werner@suse.de +- Fix pointer arithmetics within sh_trim() (bug #284611) * Tue Jun 19 2007 - werner@suse.de - Correct bug ID (bug #284580) * Fri May 25 2007 - werner@suse.de diff --git a/ksh93-shift_ijs.dif b/ksh93-shift_ijs.dif index 1068406..dec958a 100644 --- a/ksh93-shift_ijs.dif +++ b/ksh93-shift_ijs.dif @@ -116,6 +116,21 @@ #endif +@@ -250,12 +250,13 @@ void sh_trim(register char *sp) + if(sp) + { + dp = sp; +- while(c= *sp) ++ while((c = *sp)) + { + #if SHOPT_MULTIBYTE + int len; + if(mbwide() && (len=mbsize(sp))>1) + { ++ memmove(dp, sp, len); + dp += len; + sp += len; + continue; --- src/lib/libast/comp/setlocale.c +++ src/lib/libast/comp/setlocale.c 2007-03-28 18:24:16.098860000 +0200 @@ -32,6 +32,7 @@