JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* libc/stdlib/mbtowc_r.c (_mbtowc_r): Avoid dereferencing

Browse Source 
NULL pointer.
This commit is contained in:
Jonathan Larmour 2001-06-11 17:21:18 +00:00
parent f375b8d9f4
commit 43b44bc5ad
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2001-06-08 Jonathan Larmour <jlarmour@redhat.com>
* libc/stdlib/mbtowc_r.c (_mbtowc_r): Avoid dereferencing
NULL pointer.
2001-05-28 Nick Clifton <nickc@cambridge.redhat.com> 2001-05-28 Nick Clifton <nickc@cambridge.redhat.com>
* libc/stdio/vfprintf.c (_VFPRINTF_R): Handle printf ("%#.0o",0) * libc/stdio/vfprintf.c (_VFPRINTF_R): Handle printf ("%#.0o",0)

6
newlib/libc/stdlib/mbtowc_r.c
View File

@ -68,9 +68,10 @@ _DEFUN (_mbtowc_r, (r, pwc, s, n, state),
{ /* fall-through */ } { /* fall-through */ }
else if (!strcmp (r->_current_locale, "C-SJIS")) else if (!strcmp (r->_current_locale, "C-SJIS"))
{ {
int char1 = *t; int char1;
if (s == NULL) if (s == NULL)
return 0; /* not state-dependent */ return 0; /* not state-dependent */
char1 = *t;
if (_issjis1 (char1)) if (_issjis1 (char1))
{ {
int char2 = t[1]; int char2 = t[1];
@ -87,9 +88,10 @@ _DEFUN (_mbtowc_r, (r, pwc, s, n, state),
} }
else if (!strcmp (r->_current_locale, "C-EUCJP")) else if (!strcmp (r->_current_locale, "C-EUCJP"))
{ {
int char1 = *t; int char1;
if (s == NULL) if (s == NULL)
return 0; /* not state-dependent */ return 0; /* not state-dependent */
char1 = *t;
if (_iseucjp (char1)) if (_iseucjp (char1))
{ {
int char2 = t[1]; int char2 = t[1];