fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-04-29 17:30:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

_dbus_read_socket_with_unix_fds: make n_fds unsigned

Browse source 
This makes it consistent with _dbus_message_loader_get_unix_fds().

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=93069
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
This commit is contained in:
Simon McVittie 2016-02-10 13:05:40 +00:00 • committed by Ralf Habacker
parent 881d7cb064
commit ab8cb96e56
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dbus/dbus-sysdeps-unix.c
View file

@ -281,7 +281,7 @@ _dbus_read_socket_with_unix_fds (DBusSocket fd,
DBusString *buffer,
int count,
int *fds,
int *n_fds) {
unsigned int *n_fds) {
#ifndef HAVE_UNIX_FD_PASSING
int r;
@ -298,7 +298,7 @@ _dbus_read_socket_with_unix_fds (DBusSocket fd,
struct iovec iov;
_dbus_assert (count >= 0);
_dbus_assert (*n_fds >= 0);
_dbus_assert (*n_fds <= DBUS_MAXIMUM_MESSAGE_UNIX_FDS);
start = _dbus_string_get_length (buffer);
@ -378,10 +378,9 @@ _dbus_read_socket_with_unix_fds (DBusSocket fd,
size_t payload_len_fds = payload_len_bytes / sizeof (int);
size_t fds_to_use;
/* Every non-negative int fits in a size_t without truncation,
* and we already know that *n_fds is non-negative, so
/* Every unsigned int fits in a size_t without truncation, so
* casting (size_t) *n_fds is OK */
_DBUS_STATIC_ASSERT (sizeof (size_t) >= sizeof (int));
_DBUS_STATIC_ASSERT (sizeof (size_t) >= sizeof (unsigned int));
if (_DBUS_LIKELY (payload_len_fds <= (size_t) *n_fds))
{
@ -407,9 +406,10 @@ _dbus_read_socket_with_unix_fds (DBusSocket fd,
memcpy (fds, payload, fds_to_use * sizeof (int));
found = TRUE;
/* This cannot overflow because we have chosen fds_to_use
/* This narrowing cast from size_t to unsigned int cannot
* overflow because we have chosen fds_to_use
* to be <= *n_fds */
*n_fds = (int) fds_to_use;
*n_fds = (unsigned int) fds_to_use;
/* Linux doesn't tell us whether MSG_CMSG_CLOEXEC actually
worked, hence we need to go through this list and set

2
dbus/dbus-sysdeps.h
View file

@ -199,7 +199,7 @@ int _dbus_read_socket_with_unix_fds (DBusSocket fd,
DBusString *buffer,
int count,
int *fds,
int *n_fds);
unsigned int *n_fds);
DBUS_PRIVATE_EXPORT
int _dbus_write_socket_with_unix_fds (DBusSocket fd,
const DBusString *buffer,

3
dbus/dbus-transport-socket.c
View file

@ -823,7 +823,8 @@ do_reading (DBusTransport *transport)
#ifdef HAVE_UNIX_FD_PASSING
if (DBUS_TRANSPORT_CAN_SEND_UNIX_FD(transport))
{
int *fds, n_fds;
int *fds;
unsigned int n_fds;
if (!_dbus_message_loader_get_unix_fds(transport->loader, &fds, &n_fds))
{