[Libsysio-commit] HEAD: libsysio/src read.c write.c
Brought to you by:
lward
|
From: Lee W. <lw...@us...> - 2003-10-13 12:19:32
|
Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31106
Modified Files:
read.c write.c
Log Message:
Fixed bug in do_ipx{read,write}v where on error a NULL pointer could be
dereferenced.
Index: read.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/read.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -b -B -p -r1.7 -r1.8
--- read.c 13 Oct 2003 01:04:35 -0000 1.7
+++ read.c 13 Oct 2003 12:19:25 -0000 1.8
@@ -93,9 +93,11 @@ do_ixreadv(struct file *fil,
err = ino->i_ops.inop_ipreadv(fil->f_ino, ioctx);
out:
if (err) {
+ if (ioctx) {
ioctx->ioctx_cc = -1;
ioctx->ioctx_errno = -err;
_sysio_ioctx_complete(ioctx);
+ }
errno = -err;
return NULL;
}
Index: write.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/write.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -b -B -p -r1.7 -r1.8
--- write.c 13 Oct 2003 01:04:35 -0000 1.7
+++ write.c 13 Oct 2003 12:19:25 -0000 1.8
@@ -95,9 +95,11 @@ do_ixwritev(struct file *fil,
err = ino->i_ops.inop_ipwritev(fil->f_ino, ioctx);
out:
if (err) {
+ if (ioctx) {
ioctx->ioctx_cc = -1;
ioctx->ioctx_errno = -err;
_sysio_ioctx_complete(ioctx);
+ }
errno = -err;
return NULL;
}
|