CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

ltrace: Fix build with gcc10

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2019-12-23 19:39:16 -08:00
parent 56b2db8e97
commit 7b9eb2fb17
3 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
meta-oe/recipes-devtools/ltrace/ltrace/0001-ensure-the-struct-pointers-are-null-initilized.patch Normal file
View File

@ -0,0 +1,46 @@
From 67a8fa478a4484bc4dbfb3ac74e11be1dd5af594 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 23 Dec 2019 19:35:48 -0800
Subject: [PATCH] ensure the struct pointers are null initilized
Do not delete if pointer is already null
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
expr.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/expr.c b/expr.c
index 4059a32..5ffd0ad 100644
--- a/expr.c
+++ b/expr.c
@@ -189,10 +189,8 @@ int
expr_clone(struct expr_node *retp, const struct expr_node *node)
{
*retp = *node;
-
+ struct expr_node *nlhs = 0, *nrhs = 0;
switch (node->kind) {
- struct expr_node *nlhs;
- struct expr_node *nrhs;
case EXPR_OP_ARGNO:
case EXPR_OP_SELF:
@@ -236,8 +234,10 @@ expr_clone(struct expr_node *retp, const struct expr_node *node)
if (expr_alloc_and_clone(&nlhs, node->lhs, node->own_lhs) < 0) {
if (node->kind == EXPR_OP_CALL2
&& node->u.call.own_rhs) {
- expr_destroy(nrhs);
- free(nrhs);
+ if (nrhs) {
+ expr_destroy(nrhs);
+ free(nrhs);
+ }
return -1;
}
}
--
2.24.1

2
meta-oe/recipes-devtools/ltrace/ltrace/0001-hook-Do-not-append-int-to-std-string.patch
View File

@ -23,7 +23,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
if (sysconfdir != NULL && *sysconfdir != '\0') {
/* No +1, we skip the initial period. */
- syspath = malloc(strlen(sysconfdir) + sizeof FN);
+ syspath = malloc(strlen(sysconfdir) + sizeof FN + 1);
+ syspath = malloc(strlen(sysconfdir) + sizeof FN + 2);
+ syspath[strlen(sysconfdir) + sizeof FN + 1] = '\0';
if (syspath == NULL
- || sprintf(syspath, "%s/%s", sysconfdir, FN + 1) < 0)

1
meta-oe/recipes-devtools/ltrace/ltrace_git.bb
View File

@ -28,6 +28,7 @@ SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http
file://0001-hook-Do-not-append-int-to-std-string.patch \
file://include_unistd_nr.patch \
file://0001-Bug-fix-for-data-type-length-judgment.patch \
file://0001-ensure-the-struct-pointers-are-null-initilized.patch \
"
S = "${WORKDIR}/git"