Changeset 3844

Timestamp:

Mar 16, 2014, 8:55:09 PM (11 years ago)

Author:

bird

Message:

fcntl_locking: Fix offStart & cbRange check to not fail on cbRange = OFF_MAX.

Files:

• branches/libc-0.6/src/emx/src/lib/sys/b_ioFileControl.c (modified) (1 diff)
• trunk/libc/src/kNIX/os2/b_ioFileControlStandard.c (modified) (1 diff)

branches/libc-0.6/src/emx/src/lib/sys/b_ioFileControl.c

@@ -330 +330 @@
                 LIBCLOG_ERROR_RETURN_MSG(-EINVAL, "ret -EINVAL - Invalid l_whence=%d\n", pFlock->l_whence);
         }
-        if (    offStart < 0
-            ||  cbRange + offStart < 0)
+        if (   offStart < 0
+            || (   cbRange != OFF_MAX
+                && cbRange + offStart < 0) )
             LIBCLOG_ERROR_RETURN_MSG(-EINVAL, "ret -EINVAL - Invalid offStart=%llx cbRange=%llx\n", offStart, cbRange);
 

trunk/libc/src/kNIX/os2/b_ioFileControlStandard.c

@@ -264 +264 @@
                 LIBCLOG_ERROR_RETURN_MSG(-EINVAL, "ret -EINVAL - Invalid l_whence=%d\n", pFlock->l_whence);
         }
-        if (    offStart < 0
-            ||  cbRange + offStart < 0)
+        if (   offStart < 0
+            || (   cbRange != OFF_MAX
+                && cbRange + offStart < 0) )
             LIBCLOG_ERROR_RETURN_MSG(-EINVAL, "ret -EINVAL - Invalid offStart=%llx cbRange=%llx\n", offStart, cbRange);