ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More NULL pointer fixes 

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2009-08-01 10:13:20 +00:00
parent 660f11be54
commit 7cba04f6de
7 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsd-user/bsdload.c
View File

@ -163,7 +163,7 @@ int loader_exec(const char * filename, char ** argv, char ** envp,
bprm.p = TARGET_PAGE_SIZE*MAX_ARG_PAGES-sizeof(unsigned int); bprm.p = TARGET_PAGE_SIZE*MAX_ARG_PAGES-sizeof(unsigned int);
for (i=0 ; i<MAX_ARG_PAGES ; i++) /* clear page-table */ for (i=0 ; i<MAX_ARG_PAGES ; i++) /* clear page-table */
bprm.page[i] = 0; bprm.page[i] = NULL;
retval = open(filename, O_RDONLY); retval = open(filename, O_RDONLY);
if (retval < 0) if (retval < 0)
return retval; return retval;

2
bsd-user/elfload.c
View File

@ -1014,7 +1014,7 @@ static const char *lookup_symbolxx(struct syminfo *s, target_ulong orig_addr)
key.st_value = orig_addr; key.st_value = orig_addr;
sym = bsearch(&key, syms, s->disas_num_syms, sizeof(*syms), symfind); sym = bsearch(&key, syms, s->disas_num_syms, sizeof(*syms), symfind);
if (sym != 0) { if (sym != NULL) {
return s->disas_strtab + sym->st_name; return s->disas_strtab + sym->st_name;
} }

2
linux-user/elfload.c
View File

@ -1220,7 +1220,7 @@ static const char *lookup_symbolxx(struct syminfo *s, target_ulong orig_addr)
key.st_value = orig_addr; key.st_value = orig_addr;
sym = bsearch(&key, syms, s->disas_num_syms, sizeof(*syms), symfind); sym = bsearch(&key, syms, s->disas_num_syms, sizeof(*syms), symfind);
if (sym != 0) { if (sym != NULL) {
return s->disas_strtab + sym->st_name; return s->disas_strtab + sym->st_name;
} }

2
linux-user/linuxload.c
View File

@ -165,7 +165,7 @@ int loader_exec(const char * filename, char ** argv, char ** envp,
bprm->p = TARGET_PAGE_SIZE*MAX_ARG_PAGES-sizeof(unsigned int); bprm->p = TARGET_PAGE_SIZE*MAX_ARG_PAGES-sizeof(unsigned int);
for (i=0 ; i<MAX_ARG_PAGES ; i++) /* clear page-table */ for (i=0 ; i<MAX_ARG_PAGES ; i++) /* clear page-table */
bprm->page[i] = 0; bprm->page[i] = NULL;
retval = open(filename, O_RDONLY); retval = open(filename, O_RDONLY);
if (retval < 0) if (retval < 0)
return retval; return retval;

4
qemu-char.c
View File

@ -1947,7 +1947,7 @@ static void unix_process_msgfd(CharDriverState *chr, struct msghdr *msg)
static ssize_t tcp_chr_recv(CharDriverState *chr, char *buf, size_t len) static ssize_t tcp_chr_recv(CharDriverState *chr, char *buf, size_t len)
{ {
TCPCharDriver *s = chr->opaque; TCPCharDriver *s = chr->opaque;
struct msghdr msg = { 0, }; struct msghdr msg = { NULL, };
struct iovec iov[1]; struct iovec iov[1];
union { union {
struct cmsghdr cmsg; struct cmsghdr cmsg;
@ -2212,7 +2212,7 @@ CharDriverState *qemu_chr_open(const char *label, const char *filename, void (*i
CharDriverState *chr; CharDriverState *chr;
if (!strcmp(filename, "vc")) { if (!strcmp(filename, "vc")) {
chr = text_console_init(0); chr = text_console_init(NULL);
} else } else
if (strstart(filename, "vc:", &p)) { if (strstart(filename, "vc:", &p)) {
chr = text_console_init(p); chr = text_console_init(p);

6
slirp/tcp_timer.c
View File

@ -74,13 +74,15 @@ tcp_slowtimo(Slirp *slirp)
* Search through tcb's and update active timers. * Search through tcb's and update active timers.
*/ */
ip = slirp->tcb.so_next; ip = slirp->tcb.so_next;
if (ip == 0) if (ip == NULL) {
return; return;
}
for (; ip != &slirp->tcb; ip = ipnxt) { for (; ip != &slirp->tcb; ip = ipnxt) {
ipnxt = ip->so_next; ipnxt = ip->so_next;
tp = sototcpcb(ip); tp = sototcpcb(ip);
if (tp == 0) if (tp == NULL) {
continue; continue;
}
for (i = 0; i < TCPT_NTIMERS; i++) { for (i = 0; i < TCPT_NTIMERS; i++) {
if (tp->t_timer[i] && --tp->t_timer[i] == 0) { if (tp->t_timer[i] && --tp->t_timer[i] == 0) {
tcp_timers(tp,i); tcp_timers(tp,i);

2
vnc_keysym.h
View File

@ -320,5 +320,5 @@ static const name2keysym_t name2keysym[]={
{"Katakana_Real", 0xff25}, {"Katakana_Real", 0xff25},
{"Eisu_toggle", 0xff30}, {"Eisu_toggle", 0xff30},
{0,0}, {NULL,0},
}; };