rpms/cdrkit
5
0
Fork 0
Code Issues Pull Requests Releases Activity

faulty and unneeded memset caused a -Werror during build

Browse Source
This commit is contained in:
Frantisek Kluknavsky 2013-02-22 10:54:01 +01:00
parent fb0b729a60
commit 2636290d89
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cdrkit-1.1.11-memset.patch Normal file
View File

@ -0,0 +1,25 @@
diff -up wrk/genisoimage/md5.c.wrk wrk/genisoimage/md5.c
--- wrk/genisoimage/md5.c.wrk 2013-02-22 13:15:18.210866321 +0100
+++ wrk/genisoimage/md5.c 2013-02-22 13:15:29.979935133 +0100
@@ -183,7 +183,7 @@ mk_MD5Final (unsigned char digest[16], s
putu32(ctx->buf[1], digest + 4);
putu32(ctx->buf[2], digest + 8);
putu32(ctx->buf[3], digest + 12);
- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
+ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
}
/* The four core functions - F1 is optimized somewhat */
diff -up wrk/libedc/edcspeed.c.wrk wrk/libedc/edcspeed.c
--- wrk/libedc/edcspeed.c.wrk 2013-02-22 10:45:33.353219110 +0100
+++ wrk/libedc/edcspeed.c 2013-02-22 10:46:52.497686387 +0100
@@ -35,7 +35,8 @@ static int encspeed()
secs = 10;
end = 75*1000000 * secs;
- memset(sect, 0, sizeof(sect));
+ //faulty and unneccessary, immediately rewritten again
+ //memset(sect, 0, sizeof(sect));
for (i=0; i < 2352; ) {
sect[i++] = 'J';
sect[i++] = 'S';

7
cdrkit.spec
View File

@ -1,7 +1,7 @@
Summary: A collection of CD/DVD utilities Summary: A collection of CD/DVD utilities
Name: cdrkit Name: cdrkit
Version: 1.1.11 Version: 1.1.11
Release: 15%{?dist} Release: 16%{?dist}
License: GPLv2 License: GPLv2
Group: Applications/System Group: Applications/System
URL: http://cdrkit.org/ URL: http://cdrkit.org/
@ -22,6 +22,7 @@ Patch13: cdrkit-1.1.11-dvdman.patch
Patch14: cdrkit-1.1.11-paranoiacdda.patch Patch14: cdrkit-1.1.11-paranoiacdda.patch
Patch15: cdrkit-1.1.11-utf8.patch Patch15: cdrkit-1.1.11-utf8.patch
Patch16: cdrkit-1.1.11-cmakewarn.patch Patch16: cdrkit-1.1.11-cmakewarn.patch
Patch17: cdrkit-1.1.11-edcspeed_memset.patch
BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel
@ -130,6 +131,7 @@ SCSI devices.
# not using -b since otherwise backup files would be included into rpm # not using -b since otherwise backup files would be included into rpm
%patch15 -p1 %patch15 -p1
%patch16 -p1 -b .cmakewarn %patch16 -p1 -b .cmakewarn
%patch17 -p1 -b .edcspeed
# we do not want bundled paranoia library # we do not want bundled paranoia library
rm -rf libparanoia rm -rf libparanoia
@ -290,6 +292,9 @@ fi
%{_includedir}/usal %{_includedir}/usal
%changelog %changelog
* Fri Feb 22 2013 Frantisek Kluknavsky <fkluknav@redhat.com> - 1.1.11-16
- faulty and unneeded memset in edcspeed.c caused a -Werror during build
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.11-15 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.11-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild