diff mbox series

readline: backport a patch to fix for caller setting rl_prompt to NULL

Message ID 20251030193525.866305-1-joaohf@gmail.com
State New
Headers show
Series readline: backport a patch to fix for caller setting rl_prompt to NULL | expand

Commit Message

João Henrique Ferreira de Freitas Oct. 30, 2025, 7:35 p.m. UTC
I've observed this issue affecting iwctl and connmanctl.

Patching readline solves the issue.

References:

1: https://gitlab.archlinux.org/archlinux/packaging/packages/readline/-/issues/1
2: https://gitlab.archlinux.org/archlinux/packaging/packages/readline/-/commit/b30636dc66fc783a091af51b049dc5240f861dd0
3: https://lists.gnu.org/archive/html/bug-readline/2025-07/msg00007.html
4: https://lore.kernel.org/connman/20251018212411.181909-1-jsbronder@cold-front.org/

Fixes [YOCTO #16047]

Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com>
---
 ...for-caller-setting-rl_prompt-to-NULL.patch | 24 +++++++++++++++++++
 meta/recipes-core/readline/readline_8.3.bb    |  5 ++--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch

Comments

Jose Quaresma Oct. 31, 2025, 12:39 p.m. UTC | #1
Hi João,

João Henrique Ferreira de Freitas via lists.openembedded.org <joaohf=
gmail.com@lists.openembedded.org> escreveu (quinta, 30/10/2025 à(s) 19:36):

> I've observed this issue affecting iwctl and connmanctl.
>
> Patching readline solves the issue.
>
> References:
>
> 1:
> https://gitlab.archlinux.org/archlinux/packaging/packages/readline/-/issues/1
> 2:
> https://gitlab.archlinux.org/archlinux/packaging/packages/readline/-/commit/b30636dc66fc783a091af51b049dc5240f861dd0
> 3: https://lists.gnu.org/archive/html/bug-readline/2025-07/msg00007.html
> 4:
> https://lore.kernel.org/connman/20251018212411.181909-1-jsbronder@cold-front.org/
>
> Fixes [YOCTO #16047]
>
> Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com>
> ---
>  ...for-caller-setting-rl_prompt-to-NULL.patch | 24 +++++++++++++++++++
>  meta/recipes-core/readline/readline_8.3.bb    |  5 ++--
>  2 files changed, 27 insertions(+), 2 deletions(-)
>  create mode 100644
> meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch
>
> diff --git
> a/meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch
> b/meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch
> new file mode 100644
> index 0000000000..7cc366079a
> --- /dev/null
> +++
> b/meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch
> @@ -0,0 +1,24 @@
> +From 7c1019182f928ca05e794aecd06c33a27b7d07b1 Mon Sep 17 00:00:00 2001
> +From: kas User <kas@example.com>
>

Can you please use your name here too?

Jose

+Date: Thu, 30 Oct 2025 14:19:41 -0300
> +Subject: [PATCH] fix for caller setting rl_prompt to NULL
> +
> +Upstream-Status: Backport [
> https://cgit.git.savannah.gnu.org/cgit/readline.git/commit/display.c?h=devel&id=488d7edc22894d30b6de7f2d4190bf7403f63ffd
> ]
> +Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com>
> +---
> + display.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/display.c b/display.c
> +index 9aa8c7b..edb525d 100644
> +--- a/display.c
> ++++ b/display.c
> +@@ -783,7 +783,7 @@ _rl_optimize_redisplay (void)
> +
> + /* Useful shorthand used by rl_redisplay, update_line,
> rl_move_cursor_relative */
> + #define INVIS_FIRST() (local_prompt_invis_chars[0])
> +-#define WRAP_OFFSET(line, offset)  ((line <= prompt_last_screen_line) ?
> local_prompt_invis_chars[line] : 0)
> ++#define WRAP_OFFSET(line, offset)  ((line <= prompt_last_screen_line &&
> local_prompt_invis_chars) ? local_prompt_invis_chars[line] : 0)
> +
> + #define W_OFFSET(line, offset) ((line) == 0 ? offset : 0)
> + #define VIS_LLEN(l)   ((l) > _rl_vis_botlin ? 0 : (vis_lbreaks[l+1] -
> vis_lbreaks[l]))
> diff --git a/meta/recipes-core/readline/readline_8.3.bb
> b/meta/recipes-core/readline/readline_8.3.bb
> index a2f23eb353..8bc4477946 100644
> --- a/meta/recipes-core/readline/readline_8.3.bb
> +++ b/meta/recipes-core/readline/readline_8.3.bb
> @@ -1,7 +1,8 @@
>  require readline.inc
>
>  SRC_URI += "file://norpath.patch \
> -            file://fix-for-readline-event-hook.patch \
> -            "
> +           file://fix-for-readline-event-hook.patch \
> +           file://fix-for-caller-setting-rl_prompt-to-NULL.patch \
> +           "
>
>  SRC_URI[archive.sha256sum] =
> "fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc"
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#225518):
> https://lists.openembedded.org/g/openembedded-core/message/225518
> Mute This Topic: https://lists.openembedded.org/mt/116036505/5052612
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> quaresma.jose@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Jose Quaresma Oct. 31, 2025, 12:51 p.m. UTC | #2
Jose Quaresma via lists.openembedded.org <quaresma.jose=
gmail.com@lists.openembedded.org> escreveu (sexta, 31/10/2025 à(s) 12:39):

> Hi João,
>
> João Henrique Ferreira de Freitas via lists.openembedded.org <joaohf=
> gmail.com@lists.openembedded.org> escreveu (quinta, 30/10/2025 à(s)
> 19:36):
>
>> I've observed this issue affecting iwctl and connmanctl.
>>
>> Patching readline solves the issue.
>>
>> References:
>>
>> 1:
>> https://gitlab.archlinux.org/archlinux/packaging/packages/readline/-/issues/1
>> 2:
>> https://gitlab.archlinux.org/archlinux/packaging/packages/readline/-/commit/b30636dc66fc783a091af51b049dc5240f861dd0
>> 3: https://lists.gnu.org/archive/html/bug-readline/2025-07/msg00007.html
>> 4:
>> https://lore.kernel.org/connman/20251018212411.181909-1-jsbronder@cold-front.org/
>>
>> Fixes [YOCTO #16047]
>>
>> Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com>
>> ---
>>  ...for-caller-setting-rl_prompt-to-NULL.patch | 24 +++++++++++++++++++
>>  meta/recipes-core/readline/readline_8.3.bb    |  5 ++--
>>  2 files changed, 27 insertions(+), 2 deletions(-)
>>  create mode 100644
>> meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch
>>
>> diff --git
>> a/meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch
>> b/meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch
>> new file mode 100644
>> index 0000000000..7cc366079a
>> --- /dev/null
>> +++
>> b/meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch
>> @@ -0,0 +1,24 @@
>> +From 7c1019182f928ca05e794aecd06c33a27b7d07b1 Mon Sep 17 00:00:00 2001
>> +From: kas User <kas@example.com>
>>
>
> Can you please use your name here too?
>

Looking in the patch and you are not the author so can you please add the
author?


>
> Jose
>
> +Date: Thu, 30 Oct 2025 14:19:41 -0300
>> +Subject: [PATCH] fix for caller setting rl_prompt to NULL
>> +
>> +Upstream-Status: Backport [
>> https://cgit.git.savannah.gnu.org/cgit/readline.git/commit/display.c?h=devel&id=488d7edc22894d30b6de7f2d4190bf7403f63ffd
>> ]
>>
>
You need to explain the reason to only pick the changes for display.c and
drop all the others.


> +Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com>
>> +---
>> + display.c | 2 +-
>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>> +
>> +diff --git a/display.c b/display.c
>> +index 9aa8c7b..edb525d 100644
>> +--- a/display.c
>> ++++ b/display.c
>> +@@ -783,7 +783,7 @@ _rl_optimize_redisplay (void)
>> +
>> + /* Useful shorthand used by rl_redisplay, update_line,
>> rl_move_cursor_relative */
>> + #define INVIS_FIRST() (local_prompt_invis_chars[0])
>> +-#define WRAP_OFFSET(line, offset)  ((line <= prompt_last_screen_line) ?
>> local_prompt_invis_chars[line] : 0)
>> ++#define WRAP_OFFSET(line, offset)  ((line <= prompt_last_screen_line &&
>> local_prompt_invis_chars) ? local_prompt_invis_chars[line] : 0)
>> +
>> + #define W_OFFSET(line, offset) ((line) == 0 ? offset : 0)
>> + #define VIS_LLEN(l)   ((l) > _rl_vis_botlin ? 0 : (vis_lbreaks[l+1] -
>> vis_lbreaks[l]))
>>
>
The patch is also partial, two more changes are still missed.

Jose

diff --git a/meta/recipes-core/readline/readline_8.3.bb
>> b/meta/recipes-core/readline/readline_8.3.bb
>> index a2f23eb353..8bc4477946 100644
>> --- a/meta/recipes-core/readline/readline_8.3.bb
>> +++ b/meta/recipes-core/readline/readline_8.3.bb
>> @@ -1,7 +1,8 @@
>>  require readline.inc
>>
>>  SRC_URI += "file://norpath.patch \
>> -            file://fix-for-readline-event-hook.patch \
>> -            "
>> +           file://fix-for-readline-event-hook.patch \
>> +           file://fix-for-caller-setting-rl_prompt-to-NULL.patch \
>> +           "
>>
>>  SRC_URI[archive.sha256sum] =
>> "fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc"
>>
>>
>>
>>
>
> --
> Best regards,
>
> José Quaresma
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#225537):
> https://lists.openembedded.org/g/openembedded-core/message/225537
> Mute This Topic: https://lists.openembedded.org/mt/116036505/5052612
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> quaresma.jose@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
João Henrique Ferreira de Freitas Oct. 31, 2025, 3:27 p.m. UTC | #3
Hi José,

I'll fix it. I totally missed those points. Thanks.

So, the original patch is this one
https://cgit.git.savannah.gnu.org/cgit/readline.git/commit/display.c?h=devel&id=488d7edc22894d30b6de7f2d4190bf7403f63ffd
but it looks it's a mix of 5 fixes, because the commit message says:

fix for termcap on GNU Hurd; fix for caller setting rl_prompt to NULL; fix
for event hook not reading pending input; fix to accept 4-byte UTF-8
characters beginning with 0xF4; fix for macros to include character search
arguments; new function to read history from non-regular files

Also, if we take a look here:
https://lists.gnu.org/archive/html/bug-readline/2025-07/msg00007.html
mainly the patch that fix the readline issue for connmanctl/iwdctl is this
one
https://lists.gnu.org/archive/html/bug-readline/2025-07/txtmA7rksnmmi.txt

That's why I took only that change.

I'll send a v2 fixing author and explaining the reason. That why it will
make it consistent.

Thanks for reviewing it.

On Fri, Oct 31, 2025 at 9:51 AM Jose Quaresma <quaresma.jose@gmail.com>
wrote:

>
>
> Jose Quaresma via lists.openembedded.org <quaresma.jose=
> gmail.com@lists.openembedded.org> escreveu (sexta, 31/10/2025 à(s) 12:39):
>
>> Hi João,
>>
>> João Henrique Ferreira de Freitas via lists.openembedded.org <joaohf=
>> gmail.com@lists.openembedded.org> escreveu (quinta, 30/10/2025 à(s)
>> 19:36):
>>
>>> I've observed this issue affecting iwctl and connmanctl.
>>>
>>> Patching readline solves the issue.
>>>
>>> References:
>>>
>>> 1:
>>> https://gitlab.archlinux.org/archlinux/packaging/packages/readline/-/issues/1
>>> 2:
>>> https://gitlab.archlinux.org/archlinux/packaging/packages/readline/-/commit/b30636dc66fc783a091af51b049dc5240f861dd0
>>> 3: https://lists.gnu.org/archive/html/bug-readline/2025-07/msg00007.html
>>> 4:
>>> https://lore.kernel.org/connman/20251018212411.181909-1-jsbronder@cold-front.org/
>>>
>>> Fixes [YOCTO #16047]
>>>
>>> Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com>
>>> ---
>>>  ...for-caller-setting-rl_prompt-to-NULL.patch | 24 +++++++++++++++++++
>>>  meta/recipes-core/readline/readline_8.3.bb    |  5 ++--
>>>  2 files changed, 27 insertions(+), 2 deletions(-)
>>>  create mode 100644
>>> meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch
>>>
>>> diff --git
>>> a/meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch
>>> b/meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch
>>> new file mode 100644
>>> index 0000000000..7cc366079a
>>> --- /dev/null
>>> +++
>>> b/meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch
>>> @@ -0,0 +1,24 @@
>>> +From 7c1019182f928ca05e794aecd06c33a27b7d07b1 Mon Sep 17 00:00:00 2001
>>> +From: kas User <kas@example.com>
>>>
>>
>> Can you please use your name here too?
>>
>
> Looking in the patch and you are not the author so can you please add the
> author?
>
>
>>
>> Jose
>>
>> +Date: Thu, 30 Oct 2025 14:19:41 -0300
>>> +Subject: [PATCH] fix for caller setting rl_prompt to NULL
>>> +
>>> +Upstream-Status: Backport [
>>> https://cgit.git.savannah.gnu.org/cgit/readline.git/commit/display.c?h=devel&id=488d7edc22894d30b6de7f2d4190bf7403f63ffd
>>> ]
>>>
>>
> You need to explain the reason to only pick the changes for display.c and
> drop all the others.
>
>
>> +Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com>
>>> +---
>>> + display.c | 2 +-
>>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>>> +
>>> +diff --git a/display.c b/display.c
>>> +index 9aa8c7b..edb525d 100644
>>> +--- a/display.c
>>> ++++ b/display.c
>>> +@@ -783,7 +783,7 @@ _rl_optimize_redisplay (void)
>>> +
>>> + /* Useful shorthand used by rl_redisplay, update_line,
>>> rl_move_cursor_relative */
>>> + #define INVIS_FIRST() (local_prompt_invis_chars[0])
>>> +-#define WRAP_OFFSET(line, offset)  ((line <= prompt_last_screen_line)
>>> ? local_prompt_invis_chars[line] : 0)
>>> ++#define WRAP_OFFSET(line, offset)  ((line <= prompt_last_screen_line
>>> && local_prompt_invis_chars) ? local_prompt_invis_chars[line] : 0)
>>> +
>>> + #define W_OFFSET(line, offset) ((line) == 0 ? offset : 0)
>>> + #define VIS_LLEN(l)   ((l) > _rl_vis_botlin ? 0 : (vis_lbreaks[l+1] -
>>> vis_lbreaks[l]))
>>>
>>
> The patch is also partial, two more changes are still missed.
>
> Jose
>
> diff --git a/meta/recipes-core/readline/readline_8.3.bb
>>> b/meta/recipes-core/readline/readline_8.3.bb
>>> index a2f23eb353..8bc4477946 100644
>>> --- a/meta/recipes-core/readline/readline_8.3.bb
>>> +++ b/meta/recipes-core/readline/readline_8.3.bb
>>> @@ -1,7 +1,8 @@
>>>  require readline.inc
>>>
>>>  SRC_URI += "file://norpath.patch \
>>> -            file://fix-for-readline-event-hook.patch \
>>> -            "
>>> +           file://fix-for-readline-event-hook.patch \
>>> +           file://fix-for-caller-setting-rl_prompt-to-NULL.patch \
>>> +           "
>>>
>>>  SRC_URI[archive.sha256sum] =
>>> "fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc"
>>>
>>>
>>>
>>>
>>
>> --
>> Best regards,
>>
>> José Quaresma
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#225537):
>> https://lists.openembedded.org/g/openembedded-core/message/225537
>> Mute This Topic: https://lists.openembedded.org/mt/116036505/5052612
>> Group Owner: openembedded-core+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
>> quaresma.jose@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
>>
>
> --
> Best regards,
>
> José Quaresma
>
Jose Quaresma Oct. 31, 2025, 4:03 p.m. UTC | #4
João Henrique Freitas <joaohf@gmail.com> escreveu (sexta, 31/10/2025 à(s)
15:27):

> Hi José,
>
> I'll fix it. I totally missed those points. Thanks.
>
> So, the original patch is this one
> https://cgit.git.savannah.gnu.org/cgit/readline.git/commit/display.c?h=devel&id=488d7edc22894d30b6de7f2d4190bf7403f63ffd
> but it looks it's a mix of 5 fixes, because the commit message says:
>
> fix for termcap on GNU Hurd; fix for caller setting rl_prompt to NULL; fix
> for event hook not reading pending input; fix to accept 4-byte UTF-8
> characters beginning with 0xF4; fix for macros to include character search
> arguments; new function to read history from non-regular files
>
> Also, if we take a look here:
> https://lists.gnu.org/archive/html/bug-readline/2025-07/msg00007.html
> mainly the patch that fix the readline issue for connmanctl/iwdctl is this
> one
> https://lists.gnu.org/archive/html/bug-readline/2025-07/txtmA7rksnmmi.txt
>
> That's why I took only that change.
>
> I'll send a v2 fixing author and explaining the reason. That why it will
> make it consistent.
>
> Thanks for reviewing it.
>

Nice! It will be easy for the maintainer with your above description.
Thanks


>
> On Fri, Oct 31, 2025 at 9:51 AM Jose Quaresma <quaresma.jose@gmail.com>
> wrote:
>
>>
>>
>> Jose Quaresma via lists.openembedded.org <quaresma.jose=
>> gmail.com@lists.openembedded.org> escreveu (sexta, 31/10/2025 à(s)
>> 12:39):
>>
>>> Hi João,
>>>
>>> João Henrique Ferreira de Freitas via lists.openembedded.org <joaohf=
>>> gmail.com@lists.openembedded.org> escreveu (quinta, 30/10/2025 à(s)
>>> 19:36):
>>>
>>>> I've observed this issue affecting iwctl and connmanctl.
>>>>
>>>> Patching readline solves the issue.
>>>>
>>>> References:
>>>>
>>>> 1:
>>>> https://gitlab.archlinux.org/archlinux/packaging/packages/readline/-/issues/1
>>>> 2:
>>>> https://gitlab.archlinux.org/archlinux/packaging/packages/readline/-/commit/b30636dc66fc783a091af51b049dc5240f861dd0
>>>> 3:
>>>> https://lists.gnu.org/archive/html/bug-readline/2025-07/msg00007.html
>>>> 4:
>>>> https://lore.kernel.org/connman/20251018212411.181909-1-jsbronder@cold-front.org/
>>>>
>>>> Fixes [YOCTO #16047]
>>>>
>>>> Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com>
>>>> ---
>>>>  ...for-caller-setting-rl_prompt-to-NULL.patch | 24 +++++++++++++++++++
>>>>  meta/recipes-core/readline/readline_8.3.bb    |  5 ++--
>>>>  2 files changed, 27 insertions(+), 2 deletions(-)
>>>>  create mode 100644
>>>> meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch
>>>>
>>>> diff --git
>>>> a/meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch
>>>> b/meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch
>>>> new file mode 100644
>>>> index 0000000000..7cc366079a
>>>> --- /dev/null
>>>> +++
>>>> b/meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch
>>>> @@ -0,0 +1,24 @@
>>>> +From 7c1019182f928ca05e794aecd06c33a27b7d07b1 Mon Sep 17 00:00:00 2001
>>>> +From: kas User <kas@example.com>
>>>>
>>>
>>> Can you please use your name here too?
>>>
>>
>> Looking in the patch and you are not the author so can you please add the
>> author?
>>
>>
>>>
>>> Jose
>>>
>>> +Date: Thu, 30 Oct 2025 14:19:41 -0300
>>>> +Subject: [PATCH] fix for caller setting rl_prompt to NULL
>>>> +
>>>> +Upstream-Status: Backport [
>>>> https://cgit.git.savannah.gnu.org/cgit/readline.git/commit/display.c?h=devel&id=488d7edc22894d30b6de7f2d4190bf7403f63ffd
>>>> ]
>>>>
>>>
>> You need to explain the reason to only pick the changes for display.c and
>> drop all the others.
>>
>>
>>> +Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com>
>>>> +---
>>>> + display.c | 2 +-
>>>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>>>> +
>>>> +diff --git a/display.c b/display.c
>>>> +index 9aa8c7b..edb525d 100644
>>>> +--- a/display.c
>>>> ++++ b/display.c
>>>> +@@ -783,7 +783,7 @@ _rl_optimize_redisplay (void)
>>>> +
>>>> + /* Useful shorthand used by rl_redisplay, update_line,
>>>> rl_move_cursor_relative */
>>>> + #define INVIS_FIRST() (local_prompt_invis_chars[0])
>>>> +-#define WRAP_OFFSET(line, offset)  ((line <= prompt_last_screen_line)
>>>> ? local_prompt_invis_chars[line] : 0)
>>>> ++#define WRAP_OFFSET(line, offset)  ((line <= prompt_last_screen_line
>>>> && local_prompt_invis_chars) ? local_prompt_invis_chars[line] : 0)
>>>> +
>>>> + #define W_OFFSET(line, offset) ((line) == 0 ? offset : 0)
>>>> + #define VIS_LLEN(l)   ((l) > _rl_vis_botlin ? 0 : (vis_lbreaks[l+1] -
>>>> vis_lbreaks[l]))
>>>>
>>>
>> The patch is also partial, two more changes are still missed.
>>
>> Jose
>>
>> diff --git a/meta/recipes-core/readline/readline_8.3.bb
>>>> b/meta/recipes-core/readline/readline_8.3.bb
>>>> index a2f23eb353..8bc4477946 100644
>>>> --- a/meta/recipes-core/readline/readline_8.3.bb
>>>> +++ b/meta/recipes-core/readline/readline_8.3.bb
>>>> @@ -1,7 +1,8 @@
>>>>  require readline.inc
>>>>
>>>>  SRC_URI += "file://norpath.patch \
>>>> -            file://fix-for-readline-event-hook.patch \
>>>> -            "
>>>> +           file://fix-for-readline-event-hook.patch \
>>>> +           file://fix-for-caller-setting-rl_prompt-to-NULL.patch \
>>>> +           "
>>>>
>>>>  SRC_URI[archive.sha256sum] =
>>>> "fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc"
>>>>
>>>>
>>>>
>>>>
>>>
>>> --
>>> Best regards,
>>>
>>> José Quaresma
>>>
>>> -=-=-=-=-=-=-=-=-=-=-=-
>>> Links: You receive all messages sent to this group.
>>> View/Reply Online (#225537):
>>> https://lists.openembedded.org/g/openembedded-core/message/225537
>>> Mute This Topic: https://lists.openembedded.org/mt/116036505/5052612
>>> Group Owner: openembedded-core+owner@lists.openembedded.org
>>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
>>> quaresma.jose@gmail.com]
>>> -=-=-=-=-=-=-=-=-=-=-=-
>>>
>>>
>>
>> --
>> Best regards,
>>
>> José Quaresma
>>
>
>
> --
> João Henrique Ferreira de Freitas - joaohf_at_gmail.com
> Campinas-SP-Brasil
>
diff mbox series

Patch

diff --git a/meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch b/meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch
new file mode 100644
index 0000000000..7cc366079a
--- /dev/null
+++ b/meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch
@@ -0,0 +1,24 @@ 
+From 7c1019182f928ca05e794aecd06c33a27b7d07b1 Mon Sep 17 00:00:00 2001
+From: kas User <kas@example.com>
+Date: Thu, 30 Oct 2025 14:19:41 -0300
+Subject: [PATCH] fix for caller setting rl_prompt to NULL
+
+Upstream-Status: Backport [https://cgit.git.savannah.gnu.org/cgit/readline.git/commit/display.c?h=devel&id=488d7edc22894d30b6de7f2d4190bf7403f63ffd]
+Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com>
+---
+ display.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/display.c b/display.c
+index 9aa8c7b..edb525d 100644
+--- a/display.c
++++ b/display.c
+@@ -783,7 +783,7 @@ _rl_optimize_redisplay (void)
+ 
+ /* Useful shorthand used by rl_redisplay, update_line, rl_move_cursor_relative */
+ #define INVIS_FIRST()	(local_prompt_invis_chars[0])
+-#define WRAP_OFFSET(line, offset)  ((line <= prompt_last_screen_line) ? local_prompt_invis_chars[line] : 0)
++#define WRAP_OFFSET(line, offset)  ((line <= prompt_last_screen_line && local_prompt_invis_chars) ? local_prompt_invis_chars[line] : 0)
+ 
+ #define W_OFFSET(line, offset) ((line) == 0 ? offset : 0)
+ #define VIS_LLEN(l)	((l) > _rl_vis_botlin ? 0 : (vis_lbreaks[l+1] - vis_lbreaks[l]))
diff --git a/meta/recipes-core/readline/readline_8.3.bb b/meta/recipes-core/readline/readline_8.3.bb
index a2f23eb353..8bc4477946 100644
--- a/meta/recipes-core/readline/readline_8.3.bb
+++ b/meta/recipes-core/readline/readline_8.3.bb
@@ -1,7 +1,8 @@ 
 require readline.inc
 
 SRC_URI += "file://norpath.patch \
-            file://fix-for-readline-event-hook.patch \
-            "
+           file://fix-for-readline-event-hook.patch \
+           file://fix-for-caller-setting-rl_prompt-to-NULL.patch \
+           "
 
 SRC_URI[archive.sha256sum] = "fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc"