Avoid Possible Null Pointer in trio.c

For https://bugzilla.gnome.org/show_bug.cgi?id=730005
While using assert in libxml2 is really not a good idea, it's
still better to assert than crash
This commit is contained in:
Gaurav Gupta 2014-07-14 21:22:07 +08:00 committed by Daniel Veillard
parent a6ea72ad19
commit e036cb3160

10
trio.c
View File

@ -6434,11 +6434,14 @@ TRIO_ARGS2((self, intPointer),
trio_class_t *self,
int *intPointer)
{
FILE *file = (FILE *)self->location;
FILE *file;
assert(VALID(self));
assert(VALID(self->location));
assert(VALID(file));
file = (FILE *)self->location;
self->current = fgetc(file);
if (self->current == EOF)
{
@ -6467,11 +6470,14 @@ TRIO_ARGS2((self, intPointer),
trio_class_t *self,
int *intPointer)
{
int fd = *((int *)self->location);
int fd;
int size;
unsigned char input;
assert(VALID(self));
assert(VALID(self->location));
fd = *((int *)self->location);
size = read(fd, &input, sizeof(char));
if (size == -1)