ncurses 5.9 - patch 20111022

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

diff --git a/ncurses/widechar/lib_cchar.c b/ncurses/widechar/lib_cchar.c
index c61c79529db706ffb3f03605c67de08d3aa4b814..ac1b8ecac797b6426f211342ff1dde7f3b788dfc 100644 (file)
--- a/ncurses/widechar/lib_cchar.c
+++ b/ncurses/widechar/lib_cchar.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2001-2009,2010 Free Software Foundation, Inc.              *
+ * Copyright (c) 2001-2010,2011 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.20 2010/12/25 23:46:26 tom Exp $")
+MODULE_ID("$Id: lib_cchar.c,v 1.24 2011/10/22 15:52:36 tom Exp $")
 
 /* 
  * The SuSv2 description leaves some room for interpretation.  We'll assume wch
@@ -58,9 +58,9 @@ setcchar(cchar_t *wcval,
                      (void *) wcval, _nc_viswbuf(wch),
                      (unsigned long) attrs, color_pair, opts));
 
-    len = (unsigned) wcslen(wch);
     if (opts != NULL
-       || (len > 1 && wcwidth(wch[0]) < 0)) {
+       || wch == NULL
+       || ((len = wcslen(wch)) > 1 && wcwidth(wch[0]) < 0)) {
        code = ERR;
     } else {
        if (len > CCHARW_MAX)
@@ -80,7 +80,7 @@ setcchar(cchar_t *wcval,
        memset(wcval, 0, sizeof(*wcval));
 
        if (len != 0) {
-           SetAttr(*wcval, attrs | (attr_t) ColorPair(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,
@@ -110,8 +110,8 @@ getcchar(const cchar_t *wcval,
                      (void *) color_pair,
                      opts));
 
-    if (opts == NULL) {
-       len = ((wp = wmemchr(wcval->chars, L'\0', CCHARW_MAX))
+    if (opts == NULL && wcval != NULL) {
+       len = ((wp = wmemchr(wcval->chars, L'\0', (size_t) CCHARW_MAX))
               ? (int) (wp - wcval->chars)
               : CCHARW_MAX);
 
@@ -126,7 +126,7 @@ getcchar(const cchar_t *wcval,
        } else if (len >= 0) {
            *attrs = AttrOf(*wcval) & A_ATTRIBUTES;
            *color_pair = (short) GetPair(*wcval);
-           wmemcpy(wch, wcval->chars, (unsigned) len);
+           wmemcpy(wch, wcval->chars, (size_t) len);
            wch[len] = L'\0';
            code = OK;
        }