Thu Jul 28 00:48:21 2011 UTC ()

- fix memory allocation botch in wide strings
- check mbstowcs return code


(christos)

diff -r1.5 -r1.6 src/lib/libedit/chartype.c

--- src/lib/libedit/chartype.c 2011/07/27 02:18:30	1.5
+++ src/lib/libedit/chartype.c 2011/07/28 00:48:21	1.6

 @@ -1,14 +1,14 @@
-/*	$NetBSD: chartype.c,v 1.5 2011/07/27 02:18:30 christos Exp $	*/
+/*	$NetBSD: chartype.c,v 1.6 2011/07/28 00:48:21 christos Exp $	*/
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -28,52 +28,52 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * chartype.c: character classification and meta information
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: chartype.c,v 1.5 2011/07/27 02:18:30 christos Exp $");
+__RCSID("$NetBSD: chartype.c,v 1.6 2011/07/28 00:48:21 christos Exp $");
 #endif /* not lint && not SCCSID */
 #include "el.h"
 #include <stdlib.h>
 #define CT_BUFSIZ 1024
 #ifdef WIDECHAR
 protected void
 ct_conv_buff_resize(ct_buffer_t *conv, size_t mincsize, size_t minwsize)
+{
 	void *p;
 	if (mincsize > conv->csize) {
 		conv->csize = mincsize;
-		p = el_realloc(conv->cbuff, conv->csize);
+		p = el_realloc(conv->cbuff, conv->csize * sizeof(char));
 		if (p == NULL) {
 			conv->csize = 0;
 			el_free(conv->cbuff);
 			conv->cbuff = NULL;
 		} else
 			conv->cbuff = p;
+	}
 	if (minwsize > conv->wsize) {
 		conv->wsize = minwsize;
-		p = el_realloc(conv->wbuff, conv->wsize);
+		p = el_realloc(conv->wbuff, conv->wsize * sizeof(Char));
 		if (p == NULL) {
 			conv->wsize = 0;
 			el_free(conv->wbuff);
 			conv->wbuff = NULL;
 		} else
 			conv->wbuff = p;
+	}
+}
 public char *
 ct_encode_string(const Char *s, ct_buffer_t *conv)
+{
 @@ -109,27 +109,29 @@ ct_encode_string(const Char *s, ct_buffe
 public Char *
 ct_decode_string(const char *s, ct_buffer_t *conv)
+{
 	size_t len = 0;
 	if (!s)
 		return NULL;
 	if (!conv->wbuff)
 		ct_conv_buff_resize(conv, 0, CT_BUFSIZ);
 	if (!conv->wbuff)
 		return NULL;
-	len = ct_mbstowcs(0, s, 0);
+	len = ct_mbstowcs(NULL, s, 0);
 	if (len == (size_t)-1)
 		return NULL;
 	if (len > conv->wsize)
 		ct_conv_buff_resize(conv, 0, len + 1);
 	if (!conv->wbuff)
 		return NULL;
 	ct_mbstowcs(conv->wbuff, s, conv->wsize);
 	return conv->wbuff;
+}
 protected Char **
 ct_decode_argv(int argc, const char *argv[], ct_buffer_t *conv)
+{
 	size_t bufspace;