* fhandler_raw.cc (fhandler_dev_raw::ioctl): Fix setting devbuf

	when rd_parm is 0 or 1.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index d6f56576d2881ef452d6881b446aeec9d22e8b16..35bd30c33a2ffb9e3e166d7e8862ff45b220fa62 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-07  Corinna Vinschen  <corinna@vinschen.de>
+
+       * fhandler_raw.cc (fhandler_dev_raw::ioctl): Fix setting devbuf
+       when rd_parm is 0 or 1.
+
 2005-12-07  Corinna Vinschen  <corinna@vinschen.de>
 
        * fhandler_floppy.cc (fhandler_dev_floppy::lseek): Fix test for

diff --git a/winsup/cygwin/fhandler_raw.cc b/winsup/cygwin/fhandler_raw.cc
index 479515fe5c003140c05b4610d379290ec4f9f766..3f45703c9dee37509b4af1a18bda8b1e79573b7b 100644 (file)
--- a/winsup/cygwin/fhandler_raw.cc
+++ b/winsup/cygwin/fhandler_raw.cc
@@ -161,7 +161,9 @@ fhandler_dev_raw::ioctl (unsigned int cmd, void *buf)
              ret = ERROR_INVALID_PARAMETER;
            else if (!devbuf || op->rd_parm != devbufsiz)
              {
-               char *buf = new char [op->rd_parm];
+               char *buf = NULL;
+               if (op->rd_parm > 1L)
+                 buf = new char [op->rd_parm];
                if (devbufsiz > 1L)
                  {
                    memcpy (buf, devbuf + devbufstart, devbufend - devbufstart);
@@ -173,7 +175,7 @@ fhandler_dev_raw::ioctl (unsigned int cmd, void *buf)
 
                devbufstart = 0;
                devbuf = buf;
-               devbufsiz = op->rd_parm;
+               devbufsiz = op->rd_parm ?: 1L;
              }
            break;
          default:
@@ -187,7 +189,7 @@ fhandler_dev_raw::ioctl (unsigned int cmd, void *buf)
       if (!get)
        ret = ERROR_INVALID_PARAMETER;
       else
-       get->bufsiz = devbufsiz ? devbufsiz : 1L;
+       get->bufsiz = devbufsiz ?: 1L;
     }
   else
     return fhandler_base::ioctl (cmd, buf);