mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-01-30 19:03:04 +00:00
Code Issues Releases Wiki Activity

fix: Coverity warnings (#1443)

Browse source 
* fix: coverity warnings
This commit is contained in:
Charles Kerr 2020-09-10 18:50:46 -05:00 committed by GitHub
parent c2fb393390
commit d3323ddee0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 64 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libtransmission/announcer-udp.c
View file

@ -530,7 +530,7 @@ static void tau_tracker_send_request(struct tau_tracker* tracker, void const* pa
dbgmsg(tracker->key, "sending request w/connection id %" PRIu64 "\n", tracker->connection_id);
evbuffer_add_hton_64(buf, tracker->connection_id);
evbuffer_add_reference(buf, payload, payload_len, NULL, NULL);
tau_sendto(tracker->session, tracker->addr, tracker->port, evbuffer_pullup(buf, -1), evbuffer_get_length(buf));
(void)tau_sendto(tracker->session, tracker->addr, tracker->port, evbuffer_pullup(buf, -1), evbuffer_get_length(buf));
evbuffer_free(buf);
}

9
libtransmission/bitfield.c
View file

@ -410,8 +410,13 @@ void tr_bitfieldAdd(tr_bitfield* b, size_t nth)
{
if (!tr_bitfieldHas(b, nth) && tr_bitfieldEnsureNthBitAlloced(b, nth))
{
b->bits[nth >> 3U] |= 0x80 >> (nth & 7U);
tr_bitfieldIncTrueCount(b, 1);
size_t const offset = nth >> 3U;
if ((b->bits != NULL) && (offset < b->alloc_count))
{
b->bits[offset] |= 0x80 >> (nth & 7U);
tr_bitfieldIncTrueCount(b, 1);
}
}
}

2
libtransmission/makemeta.c
View file

@ -292,7 +292,7 @@ static uint8_t* getHashInfo(tr_metainfo_builder* b)
{
uint64_t const n_this_pass = MIN(b->files[fileIndex].size - off, leftInPiece);
uint64_t n_read = 0;
tr_sys_file_read(fd, bufptr, n_this_pass, &n_read, NULL);
(void)tr_sys_file_read(fd, bufptr, n_this_pass, &n_read, NULL);
bufptr += n_read;
off += n_read;
leftInPiece -= n_read;

24
libtransmission/peer-mgr.c
View file

@ -996,14 +996,17 @@ static void pieceListSort(tr_swarm* s, enum piece_sort_state state)
{
TR_ASSERT(state == PIECES_SORTED_BY_INDEX || state == PIECES_SORTED_BY_WEIGHT);
if (state == PIECES_SORTED_BY_WEIGHT)
if ((s->pieceCount > 0) && (s->pieces != NULL))
{
setComparePieceByWeightTorrent(s);
qsort(s->pieces, s->pieceCount, sizeof(struct weighted_piece), comparePieceByWeight);
}
else
{
qsort(s->pieces, s->pieceCount, sizeof(struct weighted_piece), comparePieceByIndex);
if (state == PIECES_SORTED_BY_WEIGHT)
{
setComparePieceByWeightTorrent(s);
qsort(s->pieces, s->pieceCount, sizeof(struct weighted_piece), comparePieceByWeight);
}
else
{
qsort(s->pieces, s->pieceCount, sizeof(struct weighted_piece), comparePieceByIndex);
}
}
s->pieceSortState = state;
@ -3121,8 +3124,13 @@ static void rechokeDownloads(tr_swarm* s)
tr_free(piece_is_interesting);
}
if ((rechoke != NULL) && (rechoke_count > 0))
{
qsort(rechoke, rechoke_count, sizeof(struct tr_rechoke_info), compare_rechoke_info);
}
/* now that we know which & how many peers to be interested in... update the peer interest */
qsort(rechoke, rechoke_count, sizeof(struct tr_rechoke_info), compare_rechoke_info);
s->interestedCount = MIN(maxPeers, rechoke_count);
for (int i = 0; i < rechoke_count; ++i)

4
libtransmission/platform.c
View file

@ -595,10 +595,10 @@ char const* tr_getWebClientDir(tr_session const* session)
/* XDG_DATA_DIRS are the backup directories */
{
char const* pkg = PACKAGE_DATA_DIR;
char const* const pkg = PACKAGE_DATA_DIR;
char* xdg = tr_env_get_string("XDG_DATA_DIRS", NULL);
char const* fallback = "/usr/local/share:/usr/share";
char* buf = tr_strdup_printf("%s:%s:%s", pkg != NULL ? pkg : "", xdg != NULL ? xdg : "", fallback);
char* buf = tr_strdup_printf("%s:%s:%s", pkg, xdg != NULL ? xdg : "", fallback);
tr_free(xdg);
tmp = buf;

11
libtransmission/ptrarray.c
View file

@ -171,9 +171,16 @@ int tr_ptrArrayLowerBound(tr_ptrArray const* t, void const* ptr, tr_voidptr_comp
static void assertArrayIsSortedAndUnique(tr_ptrArray const* t, tr_voidptr_compare_func compare)
{
for (int i = 0; i < t->n_items - 2; ++i)
if (t->items == NULL)
{
TR_ASSERT(compare(t->items[i], t->items[i + 1]) < 0);
TR_ASSERT(t->n_items == 0);
}
else
{
for (int i = 0; i < t->n_items - 2; ++i)
{
TR_ASSERT(compare(t->items[i], t->items[i + 1]) < 0);
}
}
}

23
libtransmission/rpcimpl.c
View file

@ -1583,16 +1583,15 @@ static char const* torrentRenamePath(tr_session* session, tr_variant* args_in, t
{
TR_UNUSED(args_out);
int torrentCount;
tr_torrent** torrents;
char const* oldpath = NULL;
char const* newname = NULL;
char const* errmsg = NULL;
tr_variantDictFindStr(args_in, TR_KEY_path, &oldpath, NULL);
tr_variantDictFindStr(args_in, TR_KEY_name, &newname, NULL);
torrents = getTorrents(session, args_in, &torrentCount);
char const* oldpath = NULL;
(void)tr_variantDictFindStr(args_in, TR_KEY_path, &oldpath, NULL);
char const* newname = NULL;
(void)tr_variantDictFindStr(args_in, TR_KEY_name, &newname, NULL);
int torrentCount = 0;
tr_torrent** torrents = getTorrents(session, args_in, &torrentCount);
if (torrentCount == 1)
{
tr_torrentRenamePath(torrents[0], oldpath, newname, torrentRenamePathDone, idle_data);
@ -1897,10 +1896,10 @@ static char const* torrentAdd(tr_session* session, tr_variant* args_in, tr_varia
TR_ASSERT(idle_data != NULL);
char const* filename = NULL;
char const* metainfo_base64 = NULL;
(void)tr_variantDictFindStr(args_in, TR_KEY_filename, &filename, NULL);
tr_variantDictFindStr(args_in, TR_KEY_filename, &filename, NULL);
tr_variantDictFindStr(args_in, TR_KEY_metainfo, &metainfo_base64, NULL);
char const* metainfo_base64 = NULL;
(void)tr_variantDictFindStr(args_in, TR_KEY_metainfo, &metainfo_base64, NULL);
if (filename == NULL && metainfo_base64 == NULL)
{
@ -1920,12 +1919,12 @@ static char const* torrentAdd(tr_session* session, tr_variant* args_in, tr_varia
int64_t i;
bool boolVal;
tr_variant* l;
char const* cookies = NULL;
tr_ctor* ctor = tr_ctorNew(session);
/* set the optional arguments */
tr_variantDictFindStr(args_in, TR_KEY_cookies, &cookies, NULL);
char const* cookies = NULL;
(void)tr_variantDictFindStr(args_in, TR_KEY_cookies, &cookies, NULL);
if (download_dir != NULL)
{

18
libtransmission/session.c
View file

@ -981,9 +981,9 @@ static void sessionSetImpl(void* vdata)
free_incoming_peer_port(session);
tr_variantDictFindStr(settings, TR_KEY_bind_address_ipv4, &str, NULL);
if (!tr_address_from_string(&b.addr, str) || b.addr.type != TR_AF_INET)
if (!tr_variantDictFindStr(settings, TR_KEY_bind_address_ipv4, &str, NULL) ||
!tr_address_from_string(&b.addr, str) ||
b.addr.type != TR_AF_INET)
{
b.addr = tr_inaddr_any;
}
@ -991,9 +991,9 @@ static void sessionSetImpl(void* vdata)
b.socket = TR_BAD_SOCKET;
session->public_ipv4 = tr_memdup(&b, sizeof(struct tr_bindinfo));
tr_variantDictFindStr(settings, TR_KEY_bind_address_ipv6, &str, NULL);
if (!tr_address_from_string(&b.addr, str) || b.addr.type != TR_AF_INET6)
if (!tr_variantDictFindStr(settings, TR_KEY_bind_address_ipv6, &str, NULL) ||
!tr_address_from_string(&b.addr, str) ||
b.addr.type != TR_AF_INET6)
{
b.addr = tr_in6addr_any;
}
@ -2692,15 +2692,13 @@ static void metainfoLookupInit(tr_session* session)
char const* tr_sessionFindTorrentFile(tr_session const* session, char const* hashString)
{
char const* filename = NULL;
if (session->metainfoLookup == NULL)
{
metainfoLookupInit((tr_session*)session);
}
tr_variantDictFindStr(session->metainfoLookup, tr_quark_new(hashString, TR_BAD_SIZE), &filename, NULL);
char const* filename = NULL;
(void)tr_variantDictFindStr(session->metainfoLookup, tr_quark_new(hashString, TR_BAD_SIZE), &filename, NULL);
return filename;
}

2
libtransmission/variant-benc.c
View file

@ -13,8 +13,6 @@
#include <event2/buffer.h>
#include "ConvertUTF.h"
#define LIBTRANSMISSION_VARIANT_MODULE
#include "transmission.h"

6
libtransmission/variant-json.c
View file

@ -560,12 +560,12 @@ static void jsonStringFunc(tr_variant const* val, void* vdata)
char* outend;
struct evbuffer_iovec vec[1];
struct jsonWalk* data = vdata;
char const* str;
size_t len;
unsigned char const* it;
unsigned char const* end;
tr_variantGetStr(val, &str, &len);
char const* str = NULL;
size_t len = 0;
(void)tr_variantGetStr(val, &str, &len);
it = (unsigned char const*)str;
end = it + len;

13
libtransmission/variant.c
View file

@ -34,7 +34,6 @@
#define LIBTRANSMISSION_VARIANT_MODULE
#include "transmission.h"
#include "ConvertUTF.h"
#include "error.h"
#include "file.h"
#include "log.h"
@ -1006,9 +1005,9 @@ static void tr_variantListCopy(tr_variant* target, tr_variant const* src)
}
else if (tr_variantIsString(val))
{
size_t len;
char const* str;
tr_variantGetStr(val, &str, &len);
size_t len = 0;
char const* str = NULL;
(void)tr_variantGetStr(val, &str, &len);
tr_variantListAddRaw(target, str, len);
}
else if (tr_variantIsDict(val))
@ -1086,9 +1085,9 @@ void tr_variantMergeDicts(tr_variant* target, tr_variant const* source)
}
else if (tr_variantIsString(val))
{
size_t len;
char const* str;
tr_variantGetStr(val, &str, &len);
size_t len = 0;
char const* str = NULL;
(void)tr_variantGetStr(val, &str, &len);
tr_variantDictAddRaw(target, key, str, len);
}
else if (tr_variantIsDict(val) && tr_variantDictFindDict(target, key, &t))