ncurses 6.4 - patch 20240420

[ncurses.git] / ncurses / widechar / lib_unget_wch.c

diff --git a/ncurses/widechar/lib_unget_wch.c b/ncurses/widechar/lib_unget_wch.c
index e18a2960fae896db32bc5e86f24f082285cd23b1..1a81fecc87058012335de5e9a6547d5b5e91692f 100644 (file)
--- a/ncurses/widechar/lib_unget_wch.c
+++ b/ncurses/widechar/lib_unget_wch.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2002-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 2002-2011,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -39,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_unget_wch.c,v 1.13 2009/10/24 21:52:49 tom Exp $")
+MODULE_ID("$Id: lib_unget_wch.c,v 1.18 2023/06/03 12:50:52 tom Exp $")
 
 /*
  * Wrapper for wcrtomb() which obtains the length needed for the given
@@ -55,11 +56,11 @@ _nc_wcrtomb(char *target, wchar_t source, mbstate_t * state)
        const wchar_t *tempp = temp;
        temp[0] = source;
        temp[1] = 0;
-       result = (int) wcsrtombs(NULL, &tempp, 0, state);
+       result = (int) wcsrtombs(NULL, &tempp, (size_t) 0, state);
     } else {
        result = (int) wcrtomb(target, source, state);
     }
-    if (!isEILSEQ(result) && (result == 0))
+    if (!isEILSEQ(result) && ((result == 0) || (result > MB_LEN_MAX)))
        result = 1;
     return (size_t) result;
 }
@@ -70,7 +71,6 @@ NCURSES_SP_NAME(unget_wch) (NCURSES_SP_DCLx const wchar_t wch)
     int result = OK;
     mbstate_t state;
     size_t length;
-    int n;
 
     T((T_CALLED("unget_wch(%p, %#lx)"), (void *) SP_PARM, (unsigned long) wch));
 
@@ -82,13 +82,15 @@ NCURSES_SP_NAME(unget_wch) (NCURSES_SP_DCLx const wchar_t wch)
        char *string;
 
        if ((string = (char *) malloc(length)) != 0) {
+           int n;
+
            init_mb(state);
            /* ignore the result, since we already validated the character */
            IGNORE_RC((int) wcrtomb(string, wch, &state));
 
            for (n = (int) (length - 1); n >= 0; --n) {
                if (NCURSES_SP_NAME(ungetch) (NCURSES_SP_ARGx
-                   UChar(string[n])) !=OK) {
+                                             UChar(string[n])) !=OK) {
                    result = ERR;
                    break;
                }