ncurses 6.0 - patch 20170304

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

diff --git a/ncurses/widechar/lib_cchar.c b/ncurses/widechar/lib_cchar.c
index 478f284ce86c639f050af7a0f5548a5e15efe86d..da28cfc0a59d8938a983d46fc9923ccdec3adcae 100644 (file)
--- a/ncurses/widechar/lib_cchar.c
+++ b/ncurses/widechar/lib_cchar.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2001-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 2001-2016,2017 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            *
@@ -35,7 +35,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_cchar.c,v 1.16 2009/10/24 23:21:31 tom Exp $")
+MODULE_ID("$Id: lib_cchar.c,v 1.29 2017/03/04 19:56:00 tom Exp $")
 
 /* 
  * The SuSv2 description leaves some room for interpretation.  We'll assume wch
@@ -47,22 +47,24 @@ NCURSES_EXPORT(int)
 setcchar(cchar_t *wcval,
         const wchar_t *wch,
         const attr_t attrs,
-        short color_pair,
+        NCURSES_PAIRS_T color_pair,
         const void *opts)
 {
-    unsigned i;
     unsigned len;
     int code = OK;
 
     TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,%lu,%d,%p)"),
                      (void *) wcval, _nc_viswbuf(wch),
-                     (unsigned long) attrs, color_pair, opts));
+                     (unsigned long) attrs, (int) color_pair, opts));
 
-    len = wcslen(wch);
     if (opts != NULL
-       || (len > 1 && wcwidth(wch[0]) < 0)) {
+       || wch == NULL
+       || ((len = (unsigned) wcslen(wch)) > 1 && wcwidth(wch[0]) < 0)
+       || color_pair < 0) {
        code = ERR;
     } else {
+       unsigned i;
+
        if (len > CCHARW_MAX)
            len = CCHARW_MAX;
 
@@ -80,7 +82,7 @@ setcchar(cchar_t *wcval,
        memset(wcval, 0, sizeof(*wcval));
 
        if (len != 0) {
-           SetAttr(*wcval, attrs | COLOR_PAIR(color_pair));
+           SetAttr(*wcval, attrs);
            SetPair(CHDEREF(wcval), color_pair);
            memcpy(&wcval->chars, wch, len * sizeof(wchar_t));
            TR(TRACE_CCALLS, ("copy %d wchars, first is %s", len,
@@ -96,11 +98,9 @@ NCURSES_EXPORT(int)
 getcchar(const cchar_t *wcval,
         wchar_t *wch,
         attr_t *attrs,
-        short *color_pair,
+        NCURSES_PAIRS_T *color_pair,
         void *opts)
 {
-    wchar_t *wp;
-    int len;
     int code = ERR;
 
     TR(TRACE_CCALLS, (T_CALLED("getcchar(%p,%p,%p,%p,%p)"),
@@ -110,10 +110,13 @@ getcchar(const cchar_t *wcval,
                      (void *) color_pair,
                      opts));
 
-    if (opts == NULL) {
-       len = (wp = wmemchr(wcval->chars, L'\0', CCHARW_MAX))
-           ? wp - wcval->chars
-           : CCHARW_MAX;
+    if (opts == NULL && wcval != NULL) {
+       wchar_t *wp;
+       int len;
+
+       len = ((wp = wmemchr(wcval->chars, L'\0', (size_t) CCHARW_MAX))
+              ? (int) (wp - wcval->chars)
+              : CCHARW_MAX);
 
        if (wch == NULL) {
            /*
@@ -125,10 +128,11 @@ getcchar(const cchar_t *wcval,
            code = ERR;
        } else if (len >= 0) {
            *attrs = AttrOf(*wcval) & A_ATTRIBUTES;
-           *color_pair = GetPair(*wcval);
-           wmemcpy(wch, wcval->chars, (unsigned) len);
+           *color_pair = (NCURSES_PAIRS_T) GetPair(*wcval);
+           wmemcpy(wch, wcval->chars, (size_t) len);
            wch[len] = L'\0';
-           code = OK;
+           if (*color_pair >= 0)
+               code = OK;
        }
     }