30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
From 68dd8af21d34c5c2cb8631f7c02c6a6cf1aa6122 Mon Sep 17 00:00:00 2001
|
|
From: realtime-neil <neil@rtr.ai>
|
|
Date: Mon, 25 Jan 2021 22:44:07 +0000
|
|
Subject: [PATCH] fix(skipcpio): edit skipcpio.c: strstr -> memmem
|
|
|
|
because CPIO_END might follow a NULL byte in buf
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/dracutdevs/dracut/commit/68dd8af21d34c5c2cb8631f7c02c6a6cf1aa6122
|
|
---
|
|
skipcpio/skipcpio.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/skipcpio/skipcpio.c b/skipcpio/skipcpio.c
|
|
index 30699816..dea216c5 100644
|
|
--- a/skipcpio/skipcpio.c
|
|
+++ b/skipcpio/skipcpio.c
|
|
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
|
|
if (s <= 0)
|
|
break;
|
|
|
|
- h = strstr(buf, CPIO_END);
|
|
+ h = memmem(buf, sizeof(buf), CPIO_END, sizeof(CPIO_END));
|
|
if (h) {
|
|
pos = (h - buf) + pos + CPIO_ENDLEN;
|
|
fseek(f, pos, SEEK_SET);
|
|
--
|
|
2.19.1
|
|
|