mirror of
https://github.com/samba-team/samba.git
synced 2025-02-08 05:57:51 +03:00
A couple more UMR fixes.
Jeremy. (This used to be commit a83702c99f1ecd6e68f8c178b20823fce6d4c6c6)
This commit is contained in:
parent
b578b4da5d
commit
e28f0a1f55
@ -176,7 +176,7 @@ char *dos_unistr2(uint16 *src)
|
||||
|
||||
nexti = (nexti+1)%8;
|
||||
|
||||
for (p = lbuf; *src && (p-lbuf < MAXUNI-3); src++) {
|
||||
for (p = lbuf; (p-lbuf < MAXUNI-3) && *src; src++) {
|
||||
uint16 ucs2_val = SVAL(src,0);
|
||||
uint16 cp_val = ucs2_to_doscp[ucs2_val];
|
||||
|
||||
@ -205,7 +205,7 @@ char *dos_unistr2_to_str(UNISTR2 *str)
|
||||
|
||||
nexti = (nexti+1)%8;
|
||||
|
||||
for (p = lbuf; *src && p-lbuf < max_size; src++) {
|
||||
for (p = lbuf; (p-lbuf < max_size) && *src; src++) {
|
||||
uint16 ucs2_val = SVAL(src,0);
|
||||
uint16 cp_val = ucs2_to_doscp[ucs2_val];
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user