diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2019-04-09 18:20:38 +0200 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2019-04-09 18:24:36 +0200 |
| commit | 99cef05b4c32c401868c7f487784130e607ca74c (patch) | |
| tree | 21c978e2209cddafd44e8b850eaa53dde7ed7553 /meta-agl-profile-core/recipes-connectivity/neardal | |
| parent | 0f1670b4b635d54c744a3e697be169957f321808 (diff) | |
| parent | ffa9f4476251778974c77e35d924c20b29bf2792 (diff) | |
Merge remote-tracking branch 'origin/sandbox/sdesneux/thud-upgrade'
Update the core distro to YP 2.6 'thud'.
Bug-AGL: SPEC-1837
Change-Id: I5a753503c4ca15bcb0d4f0f30c4a91e7d50ab024
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-profile-core/recipes-connectivity/neardal')
| -rw-r--r-- | meta-agl-profile-core/recipes-connectivity/neardal/neardal/0001-neardal-ncl-fix-segfault-on-help-page-being-displaye.patch | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/meta-agl-profile-core/recipes-connectivity/neardal/neardal/0001-neardal-ncl-fix-segfault-on-help-page-being-displaye.patch b/meta-agl-profile-core/recipes-connectivity/neardal/neardal/0001-neardal-ncl-fix-segfault-on-help-page-being-displaye.patch index 8e45e1ca2..596fe0579 100644 --- a/meta-agl-profile-core/recipes-connectivity/neardal/neardal/0001-neardal-ncl-fix-segfault-on-help-page-being-displaye.patch +++ b/meta-agl-profile-core/recipes-connectivity/neardal/neardal/0001-neardal-ncl-fix-segfault-on-help-page-being-displaye.patch @@ -1,4 +1,4 @@ -From 0f33143d13d9224ffa8b648e2d9cf11c62ba234d Mon Sep 17 00:00:00 2001 +From 795308b2452ee617da4096914b53ba3a1142e3db Mon Sep 17 00:00:00 2001 From: Matt Ranostay <matt.ranostay@konsulko.com> Date: Fri, 6 Jul 2018 17:19:09 -0700 Subject: [PATCH] neardal: ncl: fix segfault on help page being displayed @@ -7,23 +7,21 @@ LISTCMD_NAME is declared as a const char due to being defined in a macro so g_strdup it to stop proceeding operations from segfaulting. Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com> + --- ncl/ncl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ncl/ncl.c b/ncl/ncl.c -index ef42862..c26e757 100644 +index 590d13b..f4165b7 100644 --- a/ncl/ncl.c +++ b/ncl/ncl.c -@@ -342,7 +342,7 @@ int main(int argc, char *argv[]) +@@ -329,7 +329,7 @@ int main(int argc, char *argv[]) g_io_channel_unref(gNclCtx.channel); if (show_help) - ncl_exec(LISTCMD_NAME); + ncl_exec(g_strdup(LISTCMD_NAME)); - g_main_loop_run(gNclCtx.main_loop); - } --- -2.17.1 - + rl_callback_handler_install(NCL_PROMPT, ncl_parse_line); + |