summaryrefslogtreecommitdiffstats
path: root/package/busybox/0003-Revert-libbb-remove-unnecessary-variable-in-xmalloc_.patch
diff options
context:
space:
mode:
authorFerdinand van Aartsen <ferdinand@ombud.nl>2018-09-22 16:06:41 +0200
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-09-23 17:06:51 +0200
commit77497f549784b4eba4706885f8c212ca43c3864f (patch)
treefd86e708febb5f55c53dc891fb7f702fc0752a72 /package/busybox/0003-Revert-libbb-remove-unnecessary-variable-in-xmalloc_.patch
parent5dea966f897d9accdc088eac846c23e3a0c6c75d (diff)
downloadbuildroot-77497f549784b4eba4706885f8c212ca43c3864f.tar.gz
buildroot-77497f549784b4eba4706885f8c212ca43c3864f.zip
busybox: bump version to 1.29.3
Remove 0003-Revert-libbb-remove-unnecessary-variable-in-xmalloc_.patch It caused a segfault which was fixed in this release. Signed-off-by: Ferdinand van Aartsen <ferdinand@ombud.nl> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package/busybox/0003-Revert-libbb-remove-unnecessary-variable-in-xmalloc_.patch')
-rw-r--r--package/busybox/0003-Revert-libbb-remove-unnecessary-variable-in-xmalloc_.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/package/busybox/0003-Revert-libbb-remove-unnecessary-variable-in-xmalloc_.patch b/package/busybox/0003-Revert-libbb-remove-unnecessary-variable-in-xmalloc_.patch
deleted file mode 100644
index ba2d214c29..0000000000
--- a/package/busybox/0003-Revert-libbb-remove-unnecessary-variable-in-xmalloc_.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0d598ab9f03dbf320f7b81c05e4a94cb303dfbc7 Mon Sep 17 00:00:00 2001
-From: Denys Vlasenko <vda.linux@googlemail.com>
-Date: Sun, 2 Sep 2018 18:35:29 +0200
-Subject: [PATCH] Revert "libbb: remove unnecessary variable in xmalloc_fgets"
-
-The variable is in fact necessary.
-
- commit 2da9724b56169f00bd7fb6b9a11c9409a7620981
- Author: Quentin Rameau <quinq@fifth.space>
- Date: Sun Apr 1 17:05:35 2018 +0200
- libbb: remove unnecessary variable in xmalloc_fgets
-
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-[Thomas De Schampheleire: added to unbreak 'head -n -1',
-see http://lists.busybox.net/pipermail/busybox/2018-August/086617.html ]
-Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
-
----
- libbb/get_line_from_file.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
-index f3d6c6203..49ef093c2 100644
---- a/libbb/get_line_from_file.c
-+++ b/libbb/get_line_from_file.c
-@@ -47,7 +47,9 @@ char* FAST_FUNC bb_get_chunk_from_file(FILE *file, size_t *end)
- /* Get line, including trailing \n if any */
- char* FAST_FUNC xmalloc_fgets(FILE *file)
- {
-- return bb_get_chunk_from_file(file, NULL);
-+ int i;
-+
-+ return bb_get_chunk_from_file(file, &i);
- }
- /* Get line. Remove trailing \n */
- char* FAST_FUNC xmalloc_fgetline(FILE *file)
---
-2.16.4
-
OpenPOWER on IntegriCloud