Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package minicom for openSUSE:Factory checked in at 2026-06-01 18:02:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/minicom (Old) and /work/SRC/openSUSE:Factory/.minicom.new.1937 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "minicom" Mon Jun 1 18:02:49 2026 rev:49 rq:1356251 version:2.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/minicom/minicom.changes 2026-04-10 18:02:16.464782525 +0200 +++ /work/SRC/openSUSE:Factory/.minicom.new.1937/minicom.changes 2026-06-01 18:04:04.938497959 +0200 @@ -1,0 +2,6 @@ +Sat May 30 05:05:26 UTC 2026 - Andy Alt <[email protected]> + +- Add 0002-dial-Fix-use-of-check_io_frontend.patch +- Add 0003-window-Consider-that-wcwidth-can-return-1-on-invalid.patch + +------------------------------------------------------------------- New: ---- 0002-dial-Fix-use-of-check_io_frontend.patch 0003-window-Consider-that-wcwidth-can-return-1-on-invalid.patch ----------(New B)---------- New: - Add 0002-dial-Fix-use-of-check_io_frontend.patch - Add 0003-window-Consider-that-wcwidth-can-return-1-on-invalid.patch New:- Add 0002-dial-Fix-use-of-check_io_frontend.patch - Add 0003-window-Consider-that-wcwidth-can-return-1-on-invalid.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ minicom.spec ++++++ --- /var/tmp/diff_new_pack.SqRZyn/_old 2026-06-01 18:04:05.858536035 +0200 +++ /var/tmp/diff_new_pack.SqRZyn/_new 2026-06-01 18:04:05.862536200 +0200 @@ -32,6 +32,10 @@ Patch3: minicom-2.8-replace-sigrelse.patch # PATCH-FIX-UPSTREAM fix-undefined-reference.patch -- Fix undefined reference to external COLS and LINES Patch4: minicom-2.8-fix-undefined-reference.patch +# PATCH-FIX-UPSTREAM - https://salsa.debian.org/minicom-team/minicom/-/commit/a546af2f16c50f32bc4cc92108f53beb9391d8f9 +Patch5: 0002-dial-Fix-use-of-check_io_frontend.patch +# PATCH-FIX-UPSTREAM - https://salsa.debian.org/minicom-team/minicom/-/commit/9b1fcf3f47169569d79dc25488ef6b8fec740531 +Patch6: 0003-window-Consider-that-wcwidth-can-return-1-on-invalid.patch BuildRequires: ckermit BuildRequires: gettext-devel BuildRequires: ncurses-devel ++++++ 0002-dial-Fix-use-of-check_io_frontend.patch ++++++ >From a546af2f16c50f32bc4cc92108f53beb9391d8f9 Mon Sep 17 00:00:00 2001 From: Adam Lackorzynski <[email protected]> Date: Mon, 25 May 2026 09:18:15 +0200 Subject: [PATCH] dial: Fix use of check_io_frontend check_io_frontend shall use the bytes_read argument to know how many bytes where actually returned. Suggested by Andy Alt via https://salsa.debian.org/minicom-team/minicom/-/merge_requests/27 Signed-off-by: Adam Lackorzynski <[email protected]> --- src/dial.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src/dial.c b/src/dial.c index b4ef461..9f53730 100644 --- a/src/dial.c +++ b/src/dial.c @@ -460,13 +460,14 @@ MainLoop: } /* Wait 'till the modem says something */ + int buf_read_size = 1; modbuf[0] = 0; modidx = 0; s = buf; buf[0] = 0; while (dialtime > 0) { if (*s == 0) { - x = check_io_frontend(buf, sizeof(buf), NULL); + x = check_io_frontend(buf, sizeof(buf), &buf_read_size); s = buf; } if (x & 2) { @@ -487,19 +488,21 @@ MainLoop: return retst; } if (x & 1) { - /* Data available from the modem. Put in buffer. */ - if (*s == '\r' || *s == '\n') { - /* We look for [\r\n]STRING[\r\n] */ - modbuf[modidx] = 0; - modidx = 0; - } else if (modidx < 127) { - /* Normal character. Add. */ - modbuf[modidx++] = *s; - modbuf[modidx] = 0; - } - /* Skip to next received char */ - if (*s) - s++; + if (s - buf < buf_read_size) { + /* Data available from the modem. Put in buffer. */ + if (*s == '\r' || *s == '\n') { + /* We look for [\r\n]STRING[\r\n] */ + modbuf[modidx] = 0; + modidx = 0; + } else if (modidx < 127) { + /* Normal character. Add. */ + modbuf[modidx++] = *s; + modbuf[modidx] = 0; + } + /* Skip to next received char */ + if (*s) + s++; + } /* Only look when we got a whole line. */ if (modidx == 0 && !strncmp(modbuf, P_MCONNECT, strlen(P_MCONNECT))) { -- GitLab ++++++ 0003-window-Consider-that-wcwidth-can-return-1-on-invalid.patch ++++++ >From 9b1fcf3f47169569d79dc25488ef6b8fec740531 Mon Sep 17 00:00:00 2001 From: Adam Lackorzynski <[email protected]> Date: Sun, 31 May 2026 22:06:13 +0200 Subject: [PATCH] window: Consider that wcwidth can return -1 on invalid input --- src/window.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/window.c b/src/window.c index a41b928..af2184f 100644 --- a/src/window.c +++ b/src/window.c @@ -375,6 +375,8 @@ static int _write(wchar_t c, int doit, int x, int y, char attr, char color) outchar(buf[i]); } cwidth = wcwidth(c); + if (cwidth < 0) + cwidth = 0; curx += cwidth; } @@ -385,6 +387,8 @@ static int _write(wchar_t c, int doit, int x, int y, char attr, char color) e->color = color; cwidth = wcwidth(c); + if (cwidth < 0) + cwidth = 0; } } return cwidth; -- 2.54.0
