X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fnasal%2Futf8lib.c;h=7957280cf10913787382c0228d5a743f3a719761;hb=9fecb69b842814f0953d73727b2f538281c7e00a;hp=55dd7352874dac7bbd3650957d05851772fed05d;hpb=b05e32fa8c11e6d66bb70850751e170dc472a1a3;p=simgear.git diff --git a/simgear/nasal/utf8lib.c b/simgear/nasal/utf8lib.c index 55dd7352..7957280c 100644 --- a/simgear/nasal/utf8lib.c +++ b/simgear/nasal/utf8lib.c @@ -31,7 +31,8 @@ static int writec(unsigned int c, unsigned char* s, int len) static int readc(unsigned char* s, int len, int* used) { int n, i, c; - if(len > 0 && s[0] < 0x80) { *used = 1; return s[0]; } + if(!len) return -1; + if(s[0] < 0x80) { *used = 1; return s[0]; } for(n=2; n<7; n++) if((s[0] & TOPBITS(n+1)) == TOPBITS(n)) break; @@ -74,7 +75,7 @@ static naRef f_chstr(naContext ctx, naRef me, int argc, naRef* args) static naRef f_size(naContext c, naRef me, int argc, naRef* args) { unsigned char* s; - int sz=0, n, len; + int sz=0, n=0, len; if(argc < 1 || !naIsString(args[0])) naRuntimeError(c, "bad/missing argument to utf8.strc"); s = (void*)naStr_data(args[0]);