jengelh/schily
SHA256
1
0
Fork 0
forked from pool/schily
Code Pull Requests Activity

- Add mkisofs-j-crash.diff

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=5
This commit is contained in:
Jan Engelhardt 2018-04-04 13:01:19 +00:00 committed by Git OBS Bridge
parent 677de8327d
commit bd5ecfe296
3 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
mkisofs-j-crash.diff Normal file
View File

@ -0,0 +1,50 @@
From: Joerg Schilling <Joerg.Schilling@fokus.fraunhofer.de>
Date: Wed, 4 Apr 2018 14:23:49 +0200
Message-Id: <5ac4c3d5.KoDNJ6KE385qa01k%Joerg.Schilling@fokus.fraunhofer.de>
--- /tmp/sccs.qiaqyV 2018-01-25 20:32:44.873172000 +0100
+++ joliet.c 2018-04-04 14:17:50.101534000 +0200
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 4 Apr 2018 14:08:35 +0200 (CEST)
Message-ID: <alpine.LSU.2.20.1804041403120.2913@n3.vanv.qr>
Can't call strlen(source) when source==NULL.
Shouldn't call strlen(source) before checking source==NULL.
---
mkisofs/joliet.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
Index: schily-2018-03-16/mkisofs/joliet.c
===================================================================
--- schily-2018-03-16.orig/mkisofs/joliet.c
+++ schily-2018-03-16/mkisofs/joliet.c
@@ -258,13 +258,6 @@ convert_to_unicode(buffer, size, source,
int jsize;
/*
- * joliet_strlen() behaves the same way: Stop at the first nul byte.
- * Note: we cannot have 16 bit character representations in the source
- * encoding, if we like strlen() to work correctly.
- */
- jsize = strlen(source);
-
- /*
* If we get a NULL pointer for the source, it means we have an
* inplace copy, and we need to make a temporary working copy first.
*/
@@ -276,6 +269,13 @@ convert_to_unicode(buffer, size, source,
}
/*
+ * joliet_strlen() behaves the same way: Stop at the first nul byte.
+ * Note: we cannot have 16 bit character representations in the source
+ * encoding, if we like strlen() to work correctly.
+ */
+ jsize = strlen(tmpbuf);
+
+ /*
* Now start copying characters. If the size was specified to be 0,
* then assume the input was 0 terminated.
*/

5
schily.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Apr 4 12:10:08 UTC 2018 - jengelh@inai.de
- Add mkisofs-j-crash.diff
-------------------------------------------------------------------
Thu Mar 22 19:36:39 UTC 2018 - jengelh@inai.de

3
schily.spec
View File

@ -31,6 +31,7 @@ Url: http://cdrtools.sourceforge.net/private/cdrecord.html
Source: https://downloads.sf.net/schilytools/%name-%rver.tar.bz2
Patch1: gcc48wa.diff
Patch2: mkisofs-j-crash.diff
# Honor https://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Upstream_policy
# and submit patches upstream FIRST (cc to the bspkg maintainer perhaps).
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -351,7 +352,7 @@ connection, and through that, have the rmt program executed.
%prep
%setup -qn %name-%rver
%patch -P 1 -p1
%patch -P 1 -P 2 -p1
find . "(" -type d -o -type f ")" -exec chmod u+w "{}" "+"
%build