diff --git a/joe-sigiot.patch b/joe-sigiot.patch index 62142e6..ba50236 100644 --- a/joe-sigiot.patch +++ b/joe-sigiot.patch @@ -1,8 +1,29 @@ Index: uformat.c =================================================================== ---- uformat.c.orig 2009-10-22 17:55:13.000000000 +0200 -+++ uformat.c 2009-10-22 18:32:40.674592919 +0200 -@@ -564,10 +564,12 @@ int uformat(BW *bw) +--- uformat.c.orig 2008-10-28 05:13:56.000000000 +0100 ++++ uformat.c 2009-10-26 18:13:08.726241696 +0100 +@@ -361,9 +361,10 @@ void wrapword(BW *bw, P *p, long int ind + if (!bw->o.autoindent) { + /* Don't indent second line of single-line paragraphs if autoindent is off */ + int x = zlen(indents); ++ int start = x; + while (x && (indents[x - 1] == ' ' || indents[x - 1] == '\t')) + indents[--x] = 0; +- if (x) { ++ if (x < start) { + indents[x++] = ' '; + indents[x] = 0; + } +@@ -430,7 +431,7 @@ void wrapword(BW *bw, P *p, long int ind + if (!pisbol(p) && piscol(p) > indent) { + /* Move q to two (or one if 'french' is set) spaces after end of previous + word */ +- q = pdup(p, USTR "wrapword"); ++ q = pdup(p, USTR "wrapword;"); + while (!pisbol(q)) + if (!joe_isblank(p->b->o.charmap, (c = prgetc(q)))) { + pgetc(q); +@@ -564,10 +565,12 @@ int uformat(BW *bw) if (!bw->o.autoindent) { /* Don't indent second line of single-line paragraphs if autoindent is off */ int x = zlen(indents); diff --git a/joe.changes b/joe.changes index aaac2aa..ebac77b 100644 --- a/joe.changes +++ b/joe.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 26 18:17:39 CET 2009 - pth@suse.de + +- Fix yet another case of stack smashing. + ------------------------------------------------------------------- Mon Oct 26 12:09:43 CET 2009 - pth@suse.de diff --git a/joe.spec b/joe.spec index 18bfa42..6b2645e 100644 --- a/joe.spec +++ b/joe.spec @@ -24,7 +24,7 @@ License: GPL v2 or later Group: Productivity/Editors/Other AutoReqProv: on Version: 3.7 -Release: 4 +Release: 5 Summary: A Text Editor Url: http://sourceforge.net/projects/joe-editor Source: joe-%{version}.tar.bz2