diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/patches/bsdiff-CVE-2014-9862.patch | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/patches/bsdiff-CVE-2014-9862.patch')
| -rw-r--r-- | gnu/packages/patches/bsdiff-CVE-2014-9862.patch | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/gnu/packages/patches/bsdiff-CVE-2014-9862.patch b/gnu/packages/patches/bsdiff-CVE-2014-9862.patch deleted file mode 100644 index 7aab818090..0000000000 --- a/gnu/packages/patches/bsdiff-CVE-2014-9862.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/bspatch.c b/bspatch.c -index 8d95633..ab77722 100644 ---- a/bspatch.c -+++ b/bspatch.c - -@@ -187,6 +187,10 @@ - }; - - /* Sanity-check */ -+ if ((ctrl[0] < 0) || (ctrl[1] < 0)) -+ errx(1,"Corrupt patch\n"); -+ -+ /* Sanity-check */ - if(newpos+ctrl[0]>newsize) - errx(1,"Corrupt patch\n"); |