Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
7d20cc0e
Commit
7d20cc0e
authored
Aug 22, 2014
by
ssbssa
Committed by
Rémi Denis-Courmont
Aug 22, 2014
Browse files
lua: never change index of lua file descriptors
Signed-off-by:
Rémi Denis-Courmont
<
remi@remlab.net
>
parent
8bb2d53a
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/lua/libs/net.c
View file @
7d20cc0e
...
...
@@ -65,6 +65,15 @@ static int vlclua_fd_map( lua_State *L, int fd )
assert
(
dt
->
fdv
[
i
]
!=
fd
);
#endif
for
(
unsigned
i
=
0
;
i
<
dt
->
fdc
;
i
++
)
{
if
(
dt
->
fdv
[
i
]
==
-
1
)
{
dt
->
fdv
[
i
]
=
fd
;
return
3
+
i
;
}
}
if
(
dt
->
fdc
>=
64
)
return
-
1
;
...
...
@@ -125,9 +134,9 @@ static void vlclua_fd_unmap( lua_State *L, unsigned idx )
return
;
fd
=
dt
->
fdv
[
idx
];
dt
->
fd
c
--
;
memmov
e
(
dt
->
fd
v
+
idx
,
dt
->
fdv
+
idx
+
1
,
(
dt
->
fdc
-
idx
)
*
sizeof
(
dt
->
fdv
[
0
])
)
;
dt
->
fd
v
[
idx
]
=
-
1
;
whil
e
(
dt
->
fd
c
>
0
&&
dt
->
fdv
[
dt
->
fdc
-
1
]
==
-
1
)
dt
->
fdc
--
;
/* realloc() not really needed */
#ifndef NDEBUG
for
(
unsigned
i
=
0
;
i
<
dt
->
fdc
;
i
++
)
...
...
@@ -537,7 +546,8 @@ void vlclua_fd_interrupt( vlclua_dtable_t *dt )
void
vlclua_fd_cleanup
(
vlclua_dtable_t
*
dt
)
{
for
(
unsigned
i
=
0
;
i
<
dt
->
fdc
;
i
++
)
net_Close
(
dt
->
fdv
[
i
]
);
if
(
dt
->
fdv
[
i
]
!=
-
1
)
net_Close
(
dt
->
fdv
[
i
]
);
free
(
dt
->
fdv
);
#ifndef _WIN32
if
(
dt
->
fd
[
1
]
!=
-
1
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment