Control: tags 1003098 + pending

Dear maintainer,

I've prepared an NMU for joe (versioned as 4.6-1.2) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.


-- 
 .''`.  https://info.comodo.priv.at -- Debian Developer https://www.debian.org
 : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D  85FA BB3A 6801 8649 AA06
 `. `'  Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe
   `-   
diff -Nru joe-4.6/debian/changelog joe-4.6/debian/changelog
--- joe-4.6/debian/changelog	2023-02-14 23:52:07.000000000 +0100
+++ joe-4.6/debian/changelog	2024-02-06 22:21:39.000000000 +0100
@@ -1,3 +1,11 @@
+joe (4.6-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "crash at encoding prompt":
+    Add patch from upstream repo (closes: #1003098).
+
+ -- gregor herrmann <gre...@debian.org>  Tue, 06 Feb 2024 22:21:39 +0100
+
 joe (4.6-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru joe-4.6/debian/patches/005_crash_encoding_completion.patch joe-4.6/debian/patches/005_crash_encoding_completion.patch
--- joe-4.6/debian/patches/005_crash_encoding_completion.patch	1970-01-01 01:00:00.000000000 +0100
+++ joe-4.6/debian/patches/005_crash_encoding_completion.patch	2024-02-06 17:05:56.000000000 +0100
@@ -0,0 +1,60 @@
+Description: Fix "Completion at encoding prompt crashes"
+Origin: https://sourceforge.net/p/joe-editor/mercurial/ci/72ca4cecf0aef6348287f5541c03c5a34c87226c/
+Bug: https://sourceforge.net/p/joe-editor/bugs/391/
+Bug-Debian: https://bugs.debian.org/1003098
+
+--- a/joe/options.c
++++ b/joe/options.c
+@@ -1011,7 +1011,7 @@
+ 		/* Load first from global (NOTE: Order here does not matter.) */
+ 		if (!chpwd(buf) && (t = rexpnd(wildcard))) {
+ 			for (x = 0; x < aLEN(t); ++x) {
+-				*zrchr(t[x], '.') = 0;
++				if (extension) *zrchr(t[x], '.') = 0;
+ 				for (y = 0; y < aLEN(ary); ++y)
+ 					if (!zcmp(t[x], ary[y]))
+ 						break;
+@@ -1020,6 +1020,7 @@
+ 			}
+ 
+ 			varm(t);
++			t = NULL;
+ 		}
+ 	}
+ 
+@@ -1031,7 +1032,7 @@
+ 
+ 			if (!chpwd(buf) && (t = rexpnd(wildcard))) {
+ 				for (x = 0; x < aLEN(t); ++x) {
+-					*zrchr(t[x],'.') = 0;
++					if (extension) *zrchr(t[x],'.') = 0;
+ 					for (y = 0; y < aLEN(ary); ++y)
+ 						if (!zcmp(t[x],ary[y]))
+ 							break;
+@@ -1040,6 +1041,7 @@
+ 				}
+ 
+ 				varm(t);
++				t = NULL;
+ 			}
+ 		}
+ 	}
+@@ -1050,7 +1052,7 @@
+ 		t = jgetbuiltins(wildcard);
+ 
+ 		for (x = 0; x < aLEN(t); ++x) {
+-			*zrchr(t[x], '.') = 0;
++			if (extension) *zrchr(t[x], '.') = 0;
+ 			for (y = 0; y < aLEN(ary); ++y)
+ 				if (!zcmp(t[x], ary[y]))
+ 					break;
+@@ -1058,6 +1060,9 @@
+ 				ary = vaadd(ary, vsncpy(NULL, 0, sv(t[x])));
+ 			}
+ 		}
++		
++		varm(t);
++		t = NULL;
+ 	}
+ 
+ 	varm(t);
diff -Nru joe-4.6/debian/patches/series joe-4.6/debian/patches/series
--- joe-4.6/debian/patches/series	2016-11-06 14:42:00.000000000 +0100
+++ joe-4.6/debian/patches/series	2024-02-06 16:36:05.000000000 +0100
@@ -2,3 +2,4 @@
 002_mail_jsf_ugly.patch
 003_setlocale_codeset.patch
 004_debcontrol_syntax.patch
+005_crash_encoding_completion.patch

Attachment: signature.asc
Description: Digital Signature

Reply via email to