Skip to content

N
nx-libs
Commit aa7053b3 authored by walter harms's avatar walter harms Committed by Ulrich Sibiller
Browse files
Options

lcDefConv.c: fix use before check

* Do not use variables before checked for NULL. * remove some superfluid spaces (Mark Kettenis) Signed-off-by: 's avatarHarms <wharms@bfs,de> Reviewed-by: 's avatarAlan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: 's avatarAlan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: 's avatarUlrich Sibiller <uli42@gmx.de>
parent dd6dc2dd
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 11 deletions
nx-X11/lib/X11/lcDefConv.c
View file @ aa7053b3
...@@ -149,14 +149,16 @@ def_mbstowcs( ...@@ -149,14 +149,16 @@ def_mbstowcs(
XPointer *args, XPointer *args,
int num_args) int num_args)
{ {
const char *src = (const char *) *from; const char *src;
wchar_t *dst = (wchar_t *) * to; wchar_t *dst = (wchar_t *) *to;
State state = (State) conv->state; State state = (State) conv->state;
int unconv = 0; int unconv = 0;
if (from == NULL || *from == NULL) if (from == NULL || *from == NULL)
return 0; return 0;
src = (const char *) *from;
while (*from_left && *to_left) { while (*from_left && *to_left) {
(*from_left)--; (*from_left)--;
if (state->MBtoWC (state, src++, dst)) { if (state->MBtoWC (state, src++, dst)) {
...@@ -181,7 +183,7 @@ def_wcstombs( ...@@ -181,7 +183,7 @@ def_wcstombs(
XPointer *args, XPointer *args,
int num_args) int num_args)
{ {
const wchar_t *src = (const wchar_t *) * from; const wchar_t *src;
char *dst = (char *) *to; char *dst = (char *) *to;
State state = (State) conv->state; State state = (State) conv->state;
char ch[MB_LEN_MAX]; char ch[MB_LEN_MAX];
...@@ -190,6 +192,8 @@ def_wcstombs( ...@@ -190,6 +192,8 @@ def_wcstombs(
if (from == NULL || *from == NULL) if (from == NULL || *from == NULL)
return 0; return 0;
src = (const wchar_t *) *from;
while (*from_left && *to_left) { while (*from_left && *to_left) {
(*from_left)--; (*from_left)--;
if (state->WCtoMB (state, *src++, ch)) { if (state->WCtoMB (state, *src++, ch)) {
...@@ -214,7 +218,7 @@ mbstostr( ...@@ -214,7 +218,7 @@ mbstostr(
XPointer *args, XPointer *args,
int num_args) int num_args)
{ {
const char *src = (const char *) *from; const char *src;
char *dst = (char *) *to; char *dst = (char *) *to;
CodeSet codeset; CodeSet codeset;
State state = (State) conv->state; State state = (State) conv->state;
...@@ -224,6 +228,8 @@ mbstostr( ...@@ -224,6 +228,8 @@ mbstostr(
if (from == NULL || *from == NULL) if (from == NULL || *from == NULL)
return 0; return 0;
src = (const char *) *from;
while (*from_left && *to_left) { while (*from_left && *to_left) {
ch = *src++; ch = *src++;
(*from_left)--; (*from_left)--;
...@@ -251,7 +257,7 @@ wcstostr( ...@@ -251,7 +257,7 @@ wcstostr(
XPointer *args, XPointer *args,
int num_args) int num_args)
{ {
const wchar_t *src = (const wchar_t *) *from; const wchar_t *src;
char *dst = (char *) *to; char *dst = (char *) *to;
CodeSet codeset; CodeSet codeset;
State state = (State) conv->state; State state = (State) conv->state;
...@@ -261,6 +267,8 @@ wcstostr( ...@@ -261,6 +267,8 @@ wcstostr(
if (from == NULL || *from == NULL) if (from == NULL || *from == NULL)
return 0; return 0;
src = (const wchar_t *) *from;
while (*from_left && *to_left) { while (*from_left && *to_left) {
(*from_left)--; (*from_left)--;
if (state->WCtoMB (state, *src++, ch)) { if (state->WCtoMB (state, *src++, ch)) {
...@@ -290,7 +298,7 @@ mbstocs( ...@@ -290,7 +298,7 @@ mbstocs(
XPointer *args, XPointer *args,
int num_args) int num_args)
{ {
const char *src = (const char *) *from; const char *src;
char *dst = (char *) *to; char *dst = (char *) *to;
int length; int length;
State state = (State) conv->state; State state = (State) conv->state;
...@@ -300,6 +308,7 @@ mbstocs( ...@@ -300,6 +308,7 @@ mbstocs(
if (from == NULL || *from == NULL) if (from == NULL || *from == NULL)
return 0; return 0;
src = (const char *) *from;
length = min(*from_left, *to_left); length = min(*from_left, *to_left);
cur_side = *src & GR; cur_side = *src & GR;
...@@ -336,7 +345,7 @@ wcstocs( ...@@ -336,7 +345,7 @@ wcstocs(
XPointer *args, XPointer *args,
int num_args) int num_args)
{ {
const wchar_t *src = (const wchar_t *) * from; const wchar_t *src;
char *dst = (char *) *to; char *dst = (char *) *to;
State state = (State) conv->state; State state = (State) conv->state;
char cur_side = 0, ch[MB_LEN_MAX]; char cur_side = 0, ch[MB_LEN_MAX];
...@@ -346,6 +355,8 @@ wcstocs( ...@@ -346,6 +355,8 @@ wcstocs(
if (from == NULL || *from == NULL) if (from == NULL || *from == NULL)
return 0; return 0;
src = (const wchar_t *) *from;
while (*from_left) { while (*from_left) {
if ((found = state->WCtoMB (state, *src, ch))) if ((found = state->WCtoMB (state, *src, ch)))
break; break;
...@@ -398,7 +409,7 @@ cstombs( ...@@ -398,7 +409,7 @@ cstombs(
XPointer *args, XPointer *args,
int num_args) int num_args)
{ {
const char *src = (const char *) *from; const char *src;
char *dst = (char *) *to; char *dst = (char *) *to;
CodeSet codeset; CodeSet codeset;
XlcCharSet charset; XlcCharSet charset;
...@@ -410,6 +421,8 @@ cstombs( ...@@ -410,6 +421,8 @@ cstombs(
if (from == NULL || *from == NULL) if (from == NULL || *from == NULL)
return 0; return 0;
src = (const char *) *from;
if (num_args > 0) { if (num_args > 0) {
charset = (XlcCharSet) args[0]; charset = (XlcCharSet) args[0];
if (charset == NULL) if (charset == NULL)
...@@ -467,8 +480,8 @@ cstowcs( ...@@ -467,8 +480,8 @@ cstowcs(
XPointer *args, XPointer *args,
int num_args) int num_args)
{ {
const char *src = (const char *) *from; const char *src;
wchar_t *dst = (wchar_t *) * to; wchar_t *dst = (wchar_t *) *to;
CodeSet codeset; CodeSet codeset;
XlcCharSet charset; XlcCharSet charset;
State state = (State) conv->state; State state = (State) conv->state;
...@@ -479,6 +492,8 @@ cstowcs( ...@@ -479,6 +492,8 @@ cstowcs(
if (from == NULL || *from == NULL) if (from == NULL || *from == NULL)
return 0; return 0;
src = (const char *) *from;
if (num_args > 0) { if (num_args > 0) {
charset = (XlcCharSet) args[0]; charset = (XlcCharSet) args[0];
if (charset == NULL) if (charset == NULL)
...@@ -539,13 +554,14 @@ strtombs( ...@@ -539,13 +554,14 @@ strtombs(
XPointer *args, XPointer *args,
int num_args) int num_args)
{ {
const char *src = (const char *) *from; const char *src;
char *dst = (char *) *to; char *dst = (char *) *to;
int length; int length;
if (from == NULL || *from == NULL) if (from == NULL || *from == NULL)
return 0; return 0;
src = (const char *) *from;
length = min(*from_left, *to_left); length = min(*from_left, *to_left);
while (length) { while (length) {
*dst++ = *src++; *dst++ = *src++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment