Re: sysutils/rofi: fix crash

On Tue, Apr 07, 2020 at 09:29:31PM +0100, Raf Czlonka wrote:
> Given that the above redirects to https://github.com/davatorium/rofi,
> shouldn't HOMEPAGE be adjusted at the same time?

Sure.


Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/rofi/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile 12 Jul 2019 20:49:50 -0000 1.29
+++ Makefile 7 Apr 2020 20:45:15 -0000
@@ -4,9 +4,10 @@ COMMENT = window switcher, run dialog a

V = 1.5.4
DISTNAME = rofi-${V}
+REVISION = 0

CATEGORIES = sysutils x11
-HOMEPAGE = https://github.com/DaveDavenport/rofi
+HOMEPAGE = https://github.com/davatorium/rofi

MAINTAINER = Jasper Lievisse Adriaanse <jasper@openbsd.org>

Index: patches/patch-source_dialogs_script_c
===================================================================
RCS file: patches/patch-source_dialogs_script_c
diff -N patches/patch-source_dialogs_script_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-source_dialogs_script_c 7 Apr 2020 20:08:54 -0000
@@ -0,0 +1,30 @@
+$OpenBSD$
+
+Fix a crash in dmenu mode:
+https://github.com/davatorium/rofi/issues/1083
+
+Index: source/dialogs/script.c
+--- source/dialogs/script.c.orig
++++ source/dialogs/script.c
+@@ -78,10 +78,10 @@ typedef struct
+ void dmenuscript_parse_entry_extras ( G_GNUC_UNUSED Mode *sw, DmenuScriptEntry *entry, char *buffer, size_t length )
+ {
+ size_t length_key = 0;//strlen ( line );
+- while ( length_key <= length && buffer[length_key] != '\x1f' ) {
++ while ( length_key < length && buffer[length_key] != '\x1f' ) {
+ length_key++;
+ }
+- if ( length_key < length ) {
++ if ( (length_key+1) < length ) {
+ buffer[length_key] = '\0';
+ char *value = buffer + length_key + 1;
+ if ( strcasecmp(buffer, "icon" ) == 0 ) {
+@@ -98,7 +98,7 @@ static void parse_header_entry ( Mode *sw, char *line,
+ {
+ ScriptModePrivateData *pd = (ScriptModePrivateData *) sw->private_data;
+ ssize_t length_key = 0;//strlen ( line );
+- while ( length_key <= length && line[length_key] != '\x1f' ) {
++ while ( length_key < length && line[length_key] != '\x1f' ) {
+ length_key++;
+ }
+

--
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk