Patchwork [1/1] pseudo: fix uninitialised variable in realpath_fix.patch

login
register
mail settings
Submitter Joshua Lock
Date July 19, 2011, 11:57 p.m.
Message ID <2c1b7876622089db0c47848a456d9d6b0b1d6234.1311119488.git.josh@linux.intel.com>
Download mbox | patch
Permalink /patch/7939/
State New, archived
Headers show

Comments

Joshua Lock - July 19, 2011, 11:57 p.m.
Several users reported issues with pseudo on CentOS 5.x hosts, Matthew
McClintock tracked the issue to the realpath_fix.patch and Mark Hatle
supplied the included fix.

CC: Matthew McClintock <msm@freescale.com>
CC: Mark Hatle <mark.hatle@windriver.com>

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../pseudo/pseudo/realpath_fix.patch               |    2 +-
 meta/recipes-devtools/pseudo/pseudo_1.1.1.bb       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Mark Hatle - July 20, 2011, 3:33 a.m.
On 7/19/11 6:57 PM, Joshua Lock wrote:
> Several users reported issues with pseudo on CentOS 5.x hosts, Matthew
> McClintock tracked the issue to the realpath_fix.patch and Mark Hatle
> supplied the included fix.
> 
> CC: Matthew McClintock <msm@freescale.com>
> CC: Mark Hatle <mark.hatle@windriver.com>

Ack..  this has also already been included in the upstream pseudo.. when we move
to pseudo 1.1.2 we'll get this fix.

--Mark

> Signed-off-by: Joshua Lock <josh@linux.intel.com>
> ---
>  .../pseudo/pseudo/realpath_fix.patch               |    2 +-
>  meta/recipes-devtools/pseudo/pseudo_1.1.1.bb       |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-devtools/pseudo/pseudo/realpath_fix.patch b/meta/recipes-devtools/pseudo/pseudo/realpath_fix.patch
> index 7beea51..4a107e0 100644
> --- a/meta/recipes-devtools/pseudo/pseudo/realpath_fix.patch
> +++ b/meta/recipes-devtools/pseudo/pseudo/realpath_fix.patch
> @@ -65,7 +65,7 @@ index 600a918..07a4429 100644
>   
>  +static void
>  +pseudo_init_one_wrapper(pseudo_function *func) {
> -+	int (*f)(void);
> ++	int (*f)(void) = (int (*)(void)) NULL;
>  +	char *e;
>  +	if (*func->real != NULL) {
>  +		/* already initialized */
> diff --git a/meta/recipes-devtools/pseudo/pseudo_1.1.1.bb b/meta/recipes-devtools/pseudo/pseudo_1.1.1.bb
> index f1c8e63..0a61aec 100644
> --- a/meta/recipes-devtools/pseudo/pseudo_1.1.1.bb
> +++ b/meta/recipes-devtools/pseudo/pseudo_1.1.1.bb
> @@ -1,6 +1,6 @@
>  require pseudo.inc
>  
> -PR = "r1"
> +PR = "r2"
>  
>  SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \
>             file://oe-config.patch \

Patch

diff --git a/meta/recipes-devtools/pseudo/pseudo/realpath_fix.patch b/meta/recipes-devtools/pseudo/pseudo/realpath_fix.patch
index 7beea51..4a107e0 100644
--- a/meta/recipes-devtools/pseudo/pseudo/realpath_fix.patch
+++ b/meta/recipes-devtools/pseudo/pseudo/realpath_fix.patch
@@ -65,7 +65,7 @@  index 600a918..07a4429 100644
  
 +static void
 +pseudo_init_one_wrapper(pseudo_function *func) {
-+	int (*f)(void);
++	int (*f)(void) = (int (*)(void)) NULL;
 +	char *e;
 +	if (*func->real != NULL) {
 +		/* already initialized */
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.1.1.bb b/meta/recipes-devtools/pseudo/pseudo_1.1.1.bb
index f1c8e63..0a61aec 100644
--- a/meta/recipes-devtools/pseudo/pseudo_1.1.1.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_1.1.1.bb
@@ -1,6 +1,6 @@ 
 require pseudo.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://oe-config.patch \