0003-sd-device-fix-invalid-property-strv-pointers.patch.out

0003-sd-device-fix-invalid-property-strv-pointers.patch.out (text/plain), 7.79 KB, created by Albert Ou on 2015-06-12 08:14:33 UTC

***** 0003-sd-device-fix-invalid-property-strv-pointers.patch *****
PWD: /var/tmp/portage/sys-fs/udev-220-r2/work/systemd-220
PATCH TOOL: patch -> /usr/bin/patch
VERSION INFO:
GNU patch 2.7.5
Copyright (C) 2003, 2009-2012 Free Software Foundation, Inc.
Copyright (C) 1988 Larry Wall

License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.

Written by Larry Wall and Paul Eggert

===================================================================

PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch  < '/var/tmp/portage/sys-fs/udev-220-r2/work/patch/0003-sd-device-fix-invalid-property-strv-pointers.patch'

===================================================================
can't find file to patch at input line 25
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From d854ba50a82f28b776c670d27156f0e9881fde8a Mon Sep 17 00:00:00 2001
|From: Martin Pitt <[e-mail]>
|Date: Mon, 1 Jun 2015 11:32:39 +0200
|Subject: [PATCH] sd-device: fix invalid property strv pointers
|
|In device_update_properties_bufs(), the strv is built from pointers into the
|single nul-terminated buf_nulstr string, to avoid allocating the key=value
|strings twice. However, we must not do that while building and
|GREEDY_REALLOC0()'ing buf_nulstr, as each time when this actually reallocates
|memory the pointers we wrote into buf_strv so far become invalid.
|
|So change the logic to first completely build the new buf_nulstr, and then
|iterate over it to pick out the pointers to the individual key=value strings
|for properties_strv.
|
|This fixes invalid environment for udev callouts.
|---
| src/libsystemd/sd-device/device-private.c | 23 +++++++++++++----------
| 1 file changed, 13 insertions(+), 10 deletions(-)
|
|diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c
|index 10370af..deb8efd 100644
|--- a/src/libsystemd/sd-device/device-private.c
|+++ b/src/libsystemd/sd-device/device-private.c
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored

patch program exited with status 1
===================================================================

PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch  < '/var/tmp/portage/sys-fs/udev-220-r2/work/patch/0003-sd-device-fix-invalid-property-strv-pointers.patch'

===================================================================
checking file src/libsystemd/sd-device/device-private.c
Hunk #2 FAILED at 654.
1 out of 2 hunks FAILED

patch program exited with status 1
===================================================================

PATCH COMMAND:  patch -p2 -g0 -E --no-backup-if-mismatch  < '/var/tmp/portage/sys-fs/udev-220-r2/work/patch/0003-sd-device-fix-invalid-property-strv-pointers.patch'

===================================================================
can't find file to patch at input line 25
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From d854ba50a82f28b776c670d27156f0e9881fde8a Mon Sep 17 00:00:00 2001
|From: Martin Pitt <[e-mail]>
|Date: Mon, 1 Jun 2015 11:32:39 +0200
|Subject: [PATCH] sd-device: fix invalid property strv pointers
|
|In device_update_properties_bufs(), the strv is built from pointers into the
|single nul-terminated buf_nulstr string, to avoid allocating the key=value
|strings twice. However, we must not do that while building and
|GREEDY_REALLOC0()'ing buf_nulstr, as each time when this actually reallocates
|memory the pointers we wrote into buf_strv so far become invalid.
|
|So change the logic to first completely build the new buf_nulstr, and then
|iterate over it to pick out the pointers to the individual key=value strings
|for properties_strv.
|
|This fixes invalid environment for udev callouts.
|---
| src/libsystemd/sd-device/device-private.c | 23 +++++++++++++----------
| 1 file changed, 13 insertions(+), 10 deletions(-)
|
|diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c
|index 10370af..deb8efd 100644
|--- a/src/libsystemd/sd-device/device-private.c
|+++ b/src/libsystemd/sd-device/device-private.c
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored

patch program exited with status 1
===================================================================

PATCH COMMAND:  patch -p3 -g0 -E --no-backup-if-mismatch  < '/var/tmp/portage/sys-fs/udev-220-r2/work/patch/0003-sd-device-fix-invalid-property-strv-pointers.patch'

===================================================================
can't find file to patch at input line 25
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From d854ba50a82f28b776c670d27156f0e9881fde8a Mon Sep 17 00:00:00 2001
|From: Martin Pitt <[e-mail]>
|Date: Mon, 1 Jun 2015 11:32:39 +0200
|Subject: [PATCH] sd-device: fix invalid property strv pointers
|
|In device_update_properties_bufs(), the strv is built from pointers into the
|single nul-terminated buf_nulstr string, to avoid allocating the key=value
|strings twice. However, we must not do that while building and
|GREEDY_REALLOC0()'ing buf_nulstr, as each time when this actually reallocates
|memory the pointers we wrote into buf_strv so far become invalid.
|
|So change the logic to first completely build the new buf_nulstr, and then
|iterate over it to pick out the pointers to the individual key=value strings
|for properties_strv.
|
|This fixes invalid environment for udev callouts.
|---
| src/libsystemd/sd-device/device-private.c | 23 +++++++++++++----------
| 1 file changed, 13 insertions(+), 10 deletions(-)
|
|diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c
|index 10370af..deb8efd 100644
|--- a/src/libsystemd/sd-device/device-private.c
|+++ b/src/libsystemd/sd-device/device-private.c
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored

patch program exited with status 1
===================================================================

PATCH COMMAND:  patch -p4 -g0 -E --no-backup-if-mismatch  < '/var/tmp/portage/sys-fs/udev-220-r2/work/patch/0003-sd-device-fix-invalid-property-strv-pointers.patch'

===================================================================
can't find file to patch at input line 25
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From d854ba50a82f28b776c670d27156f0e9881fde8a Mon Sep 17 00:00:00 2001
|From: Martin Pitt <[e-mail]>
|Date: Mon, 1 Jun 2015 11:32:39 +0200
|Subject: [PATCH] sd-device: fix invalid property strv pointers
|
|In device_update_properties_bufs(), the strv is built from pointers into the
|single nul-terminated buf_nulstr string, to avoid allocating the key=value
|strings twice. However, we must not do that while building and
|GREEDY_REALLOC0()'ing buf_nulstr, as each time when this actually reallocates
|memory the pointers we wrote into buf_strv so far become invalid.
|
|So change the logic to first completely build the new buf_nulstr, and then
|iterate over it to pick out the pointers to the individual key=value strings
|for properties_strv.
|
|This fixes invalid environment for udev callouts.
|---
| src/libsystemd/sd-device/device-private.c | 23 +++++++++++++----------
| 1 file changed, 13 insertions(+), 10 deletions(-)
|
|diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c
|index 10370af..deb8efd 100644
|--- a/src/libsystemd/sd-device/device-private.c
|+++ b/src/libsystemd/sd-device/device-private.c
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored

patch program exited with status 1