mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-10-02 08:51:18 +02:00
Code

don't be sure that read-ahead doesn't contains nuls (13163)

Browse Source
This commit is contained in:
Sven Wischnowsky 2000-11-14 11:51:25 +00:00
parent 7dadc4e18e
commit 2d77bd0d58
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2000-11-14 Sven Wischnowsky <wischnow@zsh.org>
* 13163: Src/Modules/zpty.c: don't be sure that read-ahead doesn't
contains nuls
2000-11-13 Peter Stephenson <pws@csr.com>
* unposted: config.sub, config.status: updated from GNU sources,

13
Src/Modules/zpty.c
View File

@ -49,6 +49,7 @@ struct ptycmd {
int fin;
int read;
char *old;
int olen;
};
static Ptycmd ptycmds;
@ -375,6 +376,7 @@ newptycmd(char *nam, char *pname, char **args, int echo, int nblock)
p->fin = 0;
p->read = -1;
p->old = NULL;
p->olen = 0;
p->next = ptycmds;
ptycmds = p;
@ -462,11 +464,12 @@ ptyread(char *nam, Ptycmd cmd, char **args)
fflush(stdout);
if (cmd->old) {
used = strlen(cmd->old);
used = cmd->olen;
buf = (char *) zhalloc((blen = 256 + used) + 1);
strcpy(buf, cmd->old);
zsfree(cmd->old);
memcpy(buf, cmd->old, cmd->olen);
zfree(cmd->old, cmd->olen);
cmd->old = NULL;
cmd->olen = 0;
} else {
used = 0;
buf = (char *) zhalloc((blen = 256) + 1);
@ -516,8 +519,8 @@ ptyread(char *nam, Ptycmd cmd, char **args)
#endif
#endif
) {
cmd->old = ztrdup(buf);
used = 0;
cmd->old = (char *) zalloc(cmd->olen = used);
memcpy(cmd->old, buf, cmd->olen);
return 1;
}