mirror of
https://github.com/Zenithsiz/ftmemsim-valgrind.git
synced 2026-02-03 18:13:01 +00:00
Fix bug 69836: make record_fd_open ignore fds > VG_MAX_FD.
CCMAIL: 69836-done@bugs.kde.org git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2103
This commit is contained in:
parent
1bee40d28b
commit
144c2fa42c
@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
FILE DESCRIPTORS: 8 open at exit.
|
||||
FILE DESCRIPTORS: 7 open at exit.
|
||||
Open AF_UNIX socket .: /tmp/sock
|
||||
at 0x........: __libc_accept (...libc...)
|
||||
by 0x........: main (fdleak_cmsg.c:170)
|
||||
@ -26,13 +26,10 @@ Open file descriptor .: .
|
||||
Open file descriptor .: .
|
||||
<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...)
|
||||
by 0x........: main (fdleak_cmsg.c:174)
|
||||
@ -54,8 +51,5 @@ Open file descriptor .: .
|
||||
Open file descriptor .: .
|
||||
<inherited from parent>
|
||||
|
||||
Open file descriptor .: .
|
||||
<inherited from parent>
|
||||
|
||||
|
||||
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
FILE DESCRIPTORS: 5 open at exit.
|
||||
FILE DESCRIPTORS: 4 open at exit.
|
||||
Open file descriptor .: /tmp/file
|
||||
|
||||
at 0x........: __libc_creat (...libc...)
|
||||
@ -16,8 +16,5 @@ Open file descriptor .: .
|
||||
Open file descriptor .: .
|
||||
<inherited from parent>
|
||||
|
||||
Open file descriptor .: .
|
||||
<inherited from parent>
|
||||
|
||||
|
||||
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
FILE DESCRIPTORS: 6 open at exit.
|
||||
FILE DESCRIPTORS: 5 open at exit.
|
||||
Open file descriptor .: /dev/null
|
||||
at 0x........: __dup (in /...libc...)
|
||||
by 0x........: __libc_start_main (...libc...)
|
||||
@ -20,8 +20,5 @@ Open file descriptor .: .
|
||||
Open file descriptor .: .
|
||||
<inherited from parent>
|
||||
|
||||
Open file descriptor .: .
|
||||
<inherited from parent>
|
||||
|
||||
|
||||
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
FILE DESCRIPTORS: 7 open at exit.
|
||||
FILE DESCRIPTORS: 6 open at exit.
|
||||
Open file descriptor .: /dev/null
|
||||
at 0x........: __dup2 (in /...libc...)
|
||||
by 0x........: __libc_start_main (...libc...)
|
||||
@ -25,8 +25,5 @@ Open file descriptor .: .
|
||||
Open file descriptor .: .
|
||||
<inherited from parent>
|
||||
|
||||
Open file descriptor .: .
|
||||
<inherited from parent>
|
||||
|
||||
|
||||
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
FILE DESCRIPTORS: 6 open at exit.
|
||||
FILE DESCRIPTORS: 5 open at exit.
|
||||
Open file descriptor .: /dev/null
|
||||
at 0x........: __libc_fcntl (...libc...)
|
||||
by 0x........: main (fdleak_fcntl.c:18)
|
||||
@ -19,8 +19,5 @@ Open file descriptor .: .
|
||||
Open file descriptor .: .
|
||||
<inherited from parent>
|
||||
|
||||
Open file descriptor .: .
|
||||
<inherited from parent>
|
||||
|
||||
|
||||
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
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...)
|
||||
by 0x........: main (fdleak_ipv4.c:100)
|
||||
@ -18,13 +18,10 @@ Open file descriptor .: .
|
||||
Open file descriptor .: .
|
||||
<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...)
|
||||
by 0x........: main (fdleak_ipv4.c:104)
|
||||
@ -38,8 +35,5 @@ Open file descriptor .: .
|
||||
Open file descriptor .: .
|
||||
<inherited from parent>
|
||||
|
||||
Open file descriptor .: .
|
||||
<inherited from parent>
|
||||
|
||||
|
||||
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
FILE DESCRIPTORS: 5 open at exit.
|
||||
FILE DESCRIPTORS: 4 open at exit.
|
||||
Open file descriptor .: /dev/null
|
||||
at 0x........: __libc_open (...libc...)
|
||||
by 0x........: __libc_start_main (...libc...)
|
||||
@ -15,8 +15,5 @@ Open file descriptor .: .
|
||||
Open file descriptor .: .
|
||||
<inherited from parent>
|
||||
|
||||
Open file descriptor .: .
|
||||
<inherited from parent>
|
||||
|
||||
|
||||
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
FILE DESCRIPTORS: 6 open at exit.
|
||||
FILE DESCRIPTORS: 5 open at exit.
|
||||
Open file descriptor .:
|
||||
at 0x........: __pipe (in /...libc...)
|
||||
by 0x........: __libc_start_main (...libc...)
|
||||
@ -20,8 +20,5 @@ Open file descriptor .: .
|
||||
Open file descriptor .: .
|
||||
<inherited from parent>
|
||||
|
||||
Open file descriptor .: .
|
||||
<inherited from parent>
|
||||
|
||||
|
||||
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
FILE DESCRIPTORS: 6 open at exit.
|
||||
FILE DESCRIPTORS: 5 open at exit.
|
||||
Open AF_UNIX socket .: <unknown>
|
||||
at 0x........: __socketpair (in /...libc...)
|
||||
by 0x........: __libc_start_main (...libc...)
|
||||
@ -20,8 +20,5 @@ Open file descriptor .: .
|
||||
Open file descriptor .: .
|
||||
<inherited from parent>
|
||||
|
||||
Open file descriptor .: .
|
||||
<inherited from parent>
|
||||
|
||||
|
||||
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
|
||||
|
||||
@ -332,6 +332,9 @@ void record_fd_open(Int tid, Int fd, char *pathname)
|
||||
{
|
||||
OpenFd *i;
|
||||
|
||||
if (fd > VG_MAX_FD)
|
||||
return; /* Valgrind internal */
|
||||
|
||||
/* Check to see if this fd is already open. */
|
||||
i = allocated_fds;
|
||||
while (i) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user