ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-04 18:44:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: fixes issues detected by PVS-Studio.

Browse Source 
See http://www.viva64.com/en/b/0422/

This is Partial for https://github.com/ReOpen/ReOpenLDAP/issues/107

Change-Id: Ic47d3cb1ff88ca0807bdd692a1e01487c70b264c
This commit is contained in:
Leo Yuriev 2016-08-22 14:39:45 +03:00
parent bc7b9984d3
commit ae92d0d671
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mdb.c
View File

@ -1222,11 +1222,12 @@ mdb_strerror(int err)
static txnid_t mdbx_oomkick(MDB_env *env, txnid_t oldest); static txnid_t mdbx_oomkick(MDB_env *env, txnid_t oldest);
#endif /* MDBX_MODE_ENABLED */ #endif /* MDBX_MODE_ENABLED */
static void mdb_debug_log(int type, const char *function, int line, const char *fmt, ...)
__attribute__((format(gnu_printf, 4, 5)));
#if MDB_DEBUG #if MDB_DEBUG
static txnid_t mdb_debug_edge; static txnid_t mdb_debug_edge;
static void mdb_debug_log(int type, const char *function, int line,
const char *fmt, ...);
static void __cold static void __cold
mdb_assert_fail(MDB_env *env, const char *msg, mdb_assert_fail(MDB_env *env, const char *msg,
const char *func, int line) const char *func, int line)
@ -1263,8 +1264,7 @@ static txnid_t mdbx_oomkick(MDB_env *env, txnid_t oldest);
#endif /* MDB_DEBUG */ #endif /* MDB_DEBUG */
static void __cold static void __cold
mdb_debug_log(int type, const char *function, int line, mdb_debug_log(int type, const char *function, int line, const char *fmt, ...)
const char *fmt, ...)
{ {
va_list args; va_list args;
@ -1272,8 +1272,12 @@ mdb_debug_log(int type, const char *function, int line,
if (mdb_debug_logger) if (mdb_debug_logger)
mdb_debug_logger(type, function, line, fmt, args); mdb_debug_logger(type, function, line, fmt, args);
else { else {
if (function && line) if (function && line > 0)
fprintf(stderr, "%s:%u ", function, line); fprintf(stderr, "%s:%d ", function, line);
else if (function)
fprintf(stderr, "%s: ", function);
else if (line > 0)
fprintf(stderr, "%d: ", line);
vfprintf(stderr, fmt, args); vfprintf(stderr, fmt, args);
} }
va_end(args); va_end(args);
@ -1344,7 +1348,6 @@ char *
mdb_dkey(MDB_val *key, char *buf) mdb_dkey(MDB_val *key, char *buf)
{ {
char *ptr = buf; char *ptr = buf;
unsigned char *c = key->mv_data;
unsigned i; unsigned i;
if (!key) if (!key)
@ -1358,7 +1361,7 @@ mdb_dkey(MDB_val *key, char *buf)
#if 1 #if 1
buf[0] = '\0'; buf[0] = '\0';
for (i=0; i<key->mv_size; i++) for (i=0; i<key->mv_size; i++)
ptr += sprintf(ptr, "%02x", *c++); ptr += sprintf(ptr, "%02x", ((unsigned char*) key->mv_data)[i]);
#else #else
sprintf(buf, "%.*s", key->mv_size, key->mv_data); sprintf(buf, "%.*s", key->mv_size, key->mv_data);
#endif #endif
@ -1405,14 +1408,14 @@ mdb_page_list(MDB_page *mp)
} }
nkeys = NUMKEYS(mp); nkeys = NUMKEYS(mp);
mdb_print("%s %zu numkeys %d%s\n", type, pgno, nkeys, state); mdb_print("%s %zu numkeys %u%s\n", type, pgno, nkeys, state);
for (i=0; i<nkeys; i++) { for (i=0; i<nkeys; i++) {
if (IS_LEAF2(mp)) { /* LEAF2 pages have no mp_ptrs[] or node headers */ if (IS_LEAF2(mp)) { /* LEAF2 pages have no mp_ptrs[] or node headers */
key.mv_size = nsize = mp->mp_leaf2_ksize; key.mv_size = nsize = mp->mp_leaf2_ksize;
key.mv_data = LEAF2KEY(mp, i, nsize); key.mv_data = LEAF2KEY(mp, i, nsize);
total += nsize; total += nsize;
mdb_print("key %d: nsize %d, %s\n", i, nsize, DKEY(&key)); mdb_print("key %u: nsize %u, %s\n", i, nsize, DKEY(&key));
continue; continue;
} }
node = NODEPTR(mp, i); node = NODEPTR(mp, i);
@ -1420,7 +1423,7 @@ mdb_page_list(MDB_page *mp)
key.mv_data = node->mn_data; key.mv_data = node->mn_data;
nsize = NODESIZE + key.mv_size; nsize = NODESIZE + key.mv_size;
if (IS_BRANCH(mp)) { if (IS_BRANCH(mp)) {
mdb_print("key %d: page %zu, %s\n", i, NODEPGNO(node), DKEY(&key)); mdb_print("key %u: page %zu, %s\n", i, NODEPGNO(node), DKEY(&key));
total += nsize; total += nsize;
} else { } else {
if (F_ISSET(node->mn_flags, F_BIGDATA)) if (F_ISSET(node->mn_flags, F_BIGDATA))
@ -1429,12 +1432,12 @@ mdb_page_list(MDB_page *mp)
nsize += NODEDSZ(node); nsize += NODEDSZ(node);
total += nsize; total += nsize;
nsize += sizeof(indx_t); nsize += sizeof(indx_t);
mdb_print("key %d: nsize %d, %s%s\n", mdb_print("key %u: nsize %u, %s%s\n",
i, nsize, DKEY(&key), mdb_leafnode_type(node)); i, nsize, DKEY(&key), mdb_leafnode_type(node));
} }
total = EVEN(total); total = EVEN(total);
} }
mdb_print("Total: header %d + contents %d + unused %d\n", mdb_print("Total: header %u + contents %u + unused %u\n",
IS_LEAF2(mp) ? PAGEHDRSZ : PAGEBASE + mp->mp_lower, total, SIZELEFT(mp)); IS_LEAF2(mp) ? PAGEHDRSZ : PAGEBASE + mp->mp_lower, total, SIZELEFT(mp));
} }
@ -5651,7 +5654,7 @@ mdb_ovpage_free(MDB_cursor *mc, MDB_page *mp)
MDB_ID pn = pg << 1; MDB_ID pn = pg << 1;
int rc; int rc;
mdb_debug("free ov page %zu (%d)", pg, ovpages); mdb_debug("free ov page %zu (%u)", pg, ovpages);
/* If the page is dirty or on the spill list we just acquired it, /* If the page is dirty or on the spill list we just acquired it,
* so we should give it back to our current free list, if any. * so we should give it back to our current free list, if any.
* Otherwise put it onto the list of pages we freed in this txn. * Otherwise put it onto the list of pages we freed in this txn.

2
mdb_dump.c
View File

@ -147,7 +147,7 @@ static int dumpit(MDB_txn *txn, MDB_dbi dbi, char *name)
rc = mdb_cursor_open(txn, dbi, &mc); rc = mdb_cursor_open(txn, dbi, &mc);
if (rc) return rc; if (rc) return rc;
while ((rc = mdb_cursor_get(mc, &key, &data, MDB_NEXT) == MDB_SUCCESS)) { while ((rc = mdb_cursor_get(mc, &key, &data, MDB_NEXT)) == MDB_SUCCESS) {
if (gotsig) { if (gotsig) {
rc = EINTR; rc = EINTR;
break; break;