diff options
Diffstat (limited to 'main/busybox')
| -rw-r--r-- | main/busybox/0014-miscutils-microcom-Fixed-segfault.patch | 28 | ||||
| -rw-r--r-- | main/busybox/APKBUILD | 2 |
2 files changed, 0 insertions, 30 deletions
diff --git a/main/busybox/0014-miscutils-microcom-Fixed-segfault.patch b/main/busybox/0014-miscutils-microcom-Fixed-segfault.patch deleted file mode 100644 index 85fb12f666..0000000000 --- a/main/busybox/0014-miscutils-microcom-Fixed-segfault.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 33c5d20fd0703b678f3c097c628026002b1fd0e3 Mon Sep 17 00:00:00 2001 -From: Marian Buschsieweke <marian.buschsieweke@ovgu.de> -Date: Wed, 2 Aug 2017 23:36:08 +0200 -Subject: [PATCH] miscutils/microcom: Fixed segfault - -microcom did not check if required parameter TTY is present. Thus, -bb_basename() was called with a NULL pointer if TTY was missing. -This commit adds the missing check. ---- - miscutils/microcom.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/miscutils/microcom.c b/miscutils/microcom.c -index fa090057e..96ea02b16 100644 ---- a/miscutils/microcom.c -+++ b/miscutils/microcom.c -@@ -76,6 +76,11 @@ int microcom_main(int argc UNUSED_PARAM, char **argv) - // argc -= optind; - argv += optind; - -+ if (*argv == NULL){ -+ bb_show_usage(); -+ return EXIT_FAILURE; -+ } -+ - // try to create lock file in /var/lock - device_lock_file = (char *)bb_basename(argv[0]); - device_lock_file = xasprintf("/var/lock/LCK..%s", device_lock_file); diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index c96042a41c..05ce577f69 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -33,7 +33,6 @@ source="https://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 0010-Add-flag-for-not-following-symlinks-when-recursing.patch 0012-udhcpc-Don-t-background-if-n-is-given.patch 0013-testsuite-fix-cpio-tests.patch - 0014-miscutils-microcom-Fixed-segfault.patch acpid.logrotate busyboxconfig @@ -214,7 +213,6 @@ f96d66ce5a0295a2459a2c49c281b64e016de675ebd31a49af18cb06f3498fe27dfbc8667324b439 3b13ba6bd9b697e48864cb5376849c1ac95b30650e3e27605cc05edf4fdc1ecbb4c4503d4fe9012a581bcd660f6bb44d644575cf437d30423614cb83ee92c22c 0010-Add-flag-for-not-following-symlinks-when-recursing.patch e78a10d460e9cef545621b7b6d9da604865dc04e3a8202bdce1db9d697255818acc1150397c18101a104bc84b87de61209687e1fdc52cc244fd4fe4642a03b4e 0012-udhcpc-Don-t-background-if-n-is-given.patch d8926f0e4ed7d2fe5af89ff2a944d781b45b109c9edf1ef2591e7bce2a8bbadd7c8ca814cb3c928ae09027d9603434fe70496f308d701f3d42260ebd1e9e9b29 0013-testsuite-fix-cpio-tests.patch -8cb91903f2be3620b5500a4e8f4190537c93601282510b82303c3b516141b36ab872aeff5a7f5ae00f270439abab862ceabda531bdf180643da165b2f3b35d9f 0014-miscutils-microcom-Fixed-segfault.patch aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate ace97d165b80121968458f57d856d7f0b12ff342defe87c33ed5f994f7b00027b65f7389f6d23120a7d11449378e3d503552e87b17a3bb18337d74992b125b14 busyboxconfig 5f9739b9d0c1ba5d77e3153c373593a1bcb813cf466f951b00a2a040262e5077fb13c1a7aa17d67d1533a473bfcacc1a22833b7f491b4dde9dcb5638ad585f9a busyboxconfig-extras |