osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

androiddump: use socklen_t (32bit) instead of gssize (64bit) (CID 1293384). 

Change-Id: Ia5b7bc190eb8af509a880bb23bc0879a2dcfd39c
Reviewed-on: https://code.wireshark.org/review/16972
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
This commit is contained in:
Dario Lombardo 2016-08-09 15:40:58 +02:00
parent 1d7688c6c5
commit b7515b352a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extcap/androiddump.c
View File

@ -1456,6 +1456,7 @@ static int capture_android_bluetooth_external_parser(char *interface,
const char *adb_transport = "0012""host:transport-any";
const char *adb_transport_serial_templace = "%04x""host:transport:%s";
const char *adb_tcp_bluedroid_external_parser_template = "%04x""tcp:%05u";
socklen_t slen;
gssize length;
gssize used_buffer_length = 0;
uint64_t ts;
@ -1506,14 +1507,14 @@ static int capture_android_bluetooth_external_parser(char *interface,
return EXIT_CODE_GENERIC;
}
length = sizeof(client);
if (getsockname(sock, (struct sockaddr *) &client, (socklen_t *) &length)) {
slen = (socklen_t)sizeof(client);
if (getsockname(sock, (struct sockaddr *) &client, &slen)) {
g_warning("getsockname: %s", strerror(errno));
closesocket(sock);
return EXIT_CODE_GENERIC;
}
if (length != sizeof(client)) {
if (slen != sizeof(client)) {
g_warning("incorrect length");
closesocket(sock);
return EXIT_CODE_GENERIC;