xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

db: fix unicode support (thanks giacomo)

Browse source 
from the unicode-db patch readme:

command() receives a char* that is assigned to lp, which is a Rune*,
and lp is incremented later in readchar(), so each read consumed 4 bytes.
The only time command() is called is in runpcs() with bkpt->comm,
which is a char* built in subpcs through a char*, so the string stored in
bkpt->comm was not a Rune string. A way to test the bug is:

db program
main:b argv/X
:r
This commit is contained in:
cinap_lenrek 2015-03-19 11:44:26 +01:00
parent 4d0343c9d2
commit c86561f625
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/src/cmd/db/command.c
View file

@ -23,8 +23,8 @@ WORD adrval, cntval, loopcnt;
int adrflg, cntflg;
/* command decoding */
command(char *buf, int defcom)
int
command(Rune *buf, int defcom)
{
char *reg;
char savc;
@ -39,7 +39,7 @@ command(char *buf, int defcom)
if (*buf==EOR)
return(FALSE);
clrinp();
lp=(Rune*)buf;
lp=buf;
}
do {
adrflg=expr(0); /* first address */

2
sys/src/cmd/db/defs.h
View file

@ -64,7 +64,7 @@ struct bkpt {
int count;
int initcnt;
int flag;
char comm[MAXCOM];
Rune comm[MAXCOM];
BKPT *nxtbkpt;
};

2
sys/src/cmd/db/fns.h
View file

@ -8,7 +8,7 @@ void clrinp(void);
void cmdmap(Map*);
void cmdsrc(int, Map*);
void cmdwrite(int, Map*);
int command(char*, int);
int command(Rune*, int);
int convdig(int);
void ctrace(int);
WORD defval(WORD);

2
sys/src/cmd/db/pcs.c
View file

@ -20,7 +20,7 @@ subpcs(int modif)
int n, r;
long line, curr;
BKPT *bk;
char *comptr;
Rune *comptr;
runmode=SINGLE;
r = 0;

2
sys/src/cmd/db/print.c
View file

@ -166,7 +166,7 @@ printtrace(int modif)
dprint(buf);
if (bk->count != 1)
dprint(",%d", bk->count);
dprint(":%c %s", bk->flag == BKPTTMP ? 'B' : 'b', bk->comm);
dprint(":%c %S", bk->flag == BKPTTMP ? 'B' : 'b', bk->comm);
}
break;