From 7cba04f6dedcf888170496bf8f1857c4069d1131 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sat, 1 Aug 2009 10:13:20 +0000 Subject: More NULL pointer fixes Signed-off-by: Blue Swirl --- linux-user/elfload.c | 2 +- linux-user/linuxload.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'linux-user') diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 63d0ae4..a38167d 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1220,7 +1220,7 @@ static const char *lookup_symbolxx(struct syminfo *s, target_ulong orig_addr) key.st_value = orig_addr; sym = bsearch(&key, syms, s->disas_num_syms, sizeof(*syms), symfind); - if (sym != 0) { + if (sym != NULL) { return s->disas_strtab + sym->st_name; } diff --git a/linux-user/linuxload.c b/linux-user/linuxload.c index 14c433e..4091bdc 100644 --- a/linux-user/linuxload.c +++ b/linux-user/linuxload.c @@ -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); for (i=0 ; ipage[i] = 0; + bprm->page[i] = NULL; retval = open(filename, O_RDONLY); if (retval < 0) return retval; -- cgit v1.1