From c4f3d1354284310f18f3f6d5b3782c64e06fdea1 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Fri, 2 Dec 2011 18:02:50 +0100
Subject: erl_driver.h: Use ErlDrvSizeT for size field in ErlIOVec

---
 erts/emulator/sys/unix/sys.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'erts/emulator/sys/unix/sys.c')

diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index 52477467b3..fffdfc8a53 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -2002,17 +2002,19 @@ static void outputv(ErlDrvData e, ErlIOVec* ev)
     int pb = driver_data[fd].packet_bytes;
     int ofd = driver_data[fd].ofd;
     int n;
-    int sz;
+    ErlDrvSizeT sz;
     char lb[4];
     char* lbp;
-    int len = ev->size;
+    ErlDrvSizeT len = ev->size;
 
     /* (len > ((unsigned long)-1 >> (4-pb)*8)) */
+    /*    if (pb >= 0 && (len & (((ErlDrvSizeT)1 << (pb*8))) - 1) != len) {*/
     if (((pb == 2) && (len > 0xffff)) || (pb == 1 && len > 0xff)) {
 	driver_failure_posix(ix, EINVAL);
 	return; /* -1; */
     }
-    put_int32(len, lb);
+    /* Handles 0 <= pb <= 4 only */
+    put_int32((Uint32) len, lb);
     lbp = lb + (4-pb);
 
     ev->iov[0].iov_base = lbp;
-- 
cgit v1.2.3