|
From: Jeremy F. <je...@go...> - 2003-12-12 07:47:29
|
CVS commit by fitzhardinge:
Fix bug 69836: make record_fd_open ignore fds > VG_MAX_FD.
CCMAIL: 698...@bu...
M +2 -8 corecheck/tests/fdleak_cmsg.stderr.exp 1.2
M +1 -4 corecheck/tests/fdleak_creat.stderr.exp 1.2
M +1 -4 corecheck/tests/fdleak_dup.stderr.exp 1.2
M +1 -4 corecheck/tests/fdleak_dup2.stderr.exp 1.2
M +1 -4 corecheck/tests/fdleak_fcntl.stderr.exp 1.2
M +2 -8 corecheck/tests/fdleak_ipv4.stderr.exp 1.2
M +1 -4 corecheck/tests/fdleak_open.stderr.exp 1.2
M +1 -4 corecheck/tests/fdleak_pipe.stderr.exp 1.2
M +1 -4 corecheck/tests/fdleak_socketpair.stderr.exp 1.2
M +3 -0 coregrind/vg_syscalls.c 1.65
--- valgrind/corecheck/tests/fdleak_cmsg.stderr.exp #1.1:1.2
@@ -1,5 +1,5 @@
-FILE DESCRIPTORS: 8 open at exit.
+FILE DESCRIPTORS: 7 open at exit.
Open AF_UNIX socket .: /tmp/sock
at 0x........: __libc_accept (...libc...)
@@ -27,11 +27,8 @@
<inherited from parent>
-Open file descriptor .: .
- <inherited from parent>
-
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-FILE DESCRIPTORS: 7 open at exit.
+FILE DESCRIPTORS: 6 open at exit.
Open file descriptor .: /tmp/data2
at 0x........: __libc_recvmsg (...libc...)
@@ -55,7 +52,4 @@
<inherited from parent>
-Open file descriptor .: .
- <inherited from parent>
-
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
--- valgrind/corecheck/tests/fdleak_creat.stderr.exp #1.1:1.2
@@ -1,5 +1,5 @@
-FILE DESCRIPTORS: 5 open at exit.
+FILE DESCRIPTORS: 4 open at exit.
Open file descriptor .: /tmp/file
@@ -17,7 +17,4 @@
<inherited from parent>
-Open file descriptor .: .
- <inherited from parent>
-
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
--- valgrind/corecheck/tests/fdleak_dup.stderr.exp #1.1:1.2
@@ -1,5 +1,5 @@
-FILE DESCRIPTORS: 6 open at exit.
+FILE DESCRIPTORS: 5 open at exit.
Open file descriptor .: /dev/null
at 0x........: __dup (in /...libc...)
@@ -21,7 +21,4 @@
<inherited from parent>
-Open file descriptor .: .
- <inherited from parent>
-
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
--- valgrind/corecheck/tests/fdleak_dup2.stderr.exp #1.1:1.2
@@ -1,5 +1,5 @@
-FILE DESCRIPTORS: 7 open at exit.
+FILE DESCRIPTORS: 6 open at exit.
Open file descriptor .: /dev/null
at 0x........: __dup2 (in /...libc...)
@@ -26,7 +26,4 @@
<inherited from parent>
-Open file descriptor .: .
- <inherited from parent>
-
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
--- valgrind/corecheck/tests/fdleak_fcntl.stderr.exp #1.1:1.2
@@ -1,5 +1,5 @@
-FILE DESCRIPTORS: 6 open at exit.
+FILE DESCRIPTORS: 5 open at exit.
Open file descriptor .: /dev/null
at 0x........: __libc_fcntl (...libc...)
@@ -20,7 +20,4 @@
<inherited from parent>
-Open file descriptor .: .
- <inherited from parent>
-
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
--- valgrind/corecheck/tests/fdleak_ipv4.stderr.exp #1.1:1.2
@@ -1,5 +1,5 @@
-FILE DESCRIPTORS: 6 open at exit.
+FILE DESCRIPTORS: 5 open at exit.
Open AF_INET socket 4: 127.0.0.1:... <-> 127.0.0.1:...
at 0x........: __libc_accept (...libc...)
@@ -19,11 +19,8 @@
<inherited from parent>
-Open file descriptor .: .
- <inherited from parent>
-
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-FILE DESCRIPTORS: 5 open at exit.
+FILE DESCRIPTORS: 4 open at exit.
Open AF_INET socket 3: 127.0.0.1:... <-> 127.0.0.1:...
at 0x........: __socket (in /...libc...)
@@ -39,7 +36,4 @@
<inherited from parent>
-Open file descriptor .: .
- <inherited from parent>
-
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
--- valgrind/corecheck/tests/fdleak_open.stderr.exp #1.1:1.2
@@ -1,5 +1,5 @@
-FILE DESCRIPTORS: 5 open at exit.
+FILE DESCRIPTORS: 4 open at exit.
Open file descriptor .: /dev/null
at 0x........: __libc_open (...libc...)
@@ -16,7 +16,4 @@
<inherited from parent>
-Open file descriptor .: .
- <inherited from parent>
-
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
--- valgrind/corecheck/tests/fdleak_pipe.stderr.exp #1.1:1.2
@@ -1,5 +1,5 @@
-FILE DESCRIPTORS: 6 open at exit.
+FILE DESCRIPTORS: 5 open at exit.
Open file descriptor .:
at 0x........: __pipe (in /...libc...)
@@ -21,7 +21,4 @@
<inherited from parent>
-Open file descriptor .: .
- <inherited from parent>
-
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
--- valgrind/corecheck/tests/fdleak_socketpair.stderr.exp #1.1:1.2
@@ -1,5 +1,5 @@
-FILE DESCRIPTORS: 6 open at exit.
+FILE DESCRIPTORS: 5 open at exit.
Open AF_UNIX socket .: <unknown>
at 0x........: __socketpair (in /...libc...)
@@ -21,7 +21,4 @@
<inherited from parent>
-Open file descriptor .: .
- <inherited from parent>
-
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
--- valgrind/coregrind/vg_syscalls.c #1.64:1.65
@@ -333,4 +333,7 @@ void record_fd_open(Int tid, Int fd, cha
OpenFd *i;
+ if (fd > VG_MAX_FD)
+ return; /* Valgrind internal */
+
/* Check to see if this fd is already open. */
i = allocated_fds;
|