Add assertions before potential null deferences #11238

meshcollider · 2017-09-05T09:39:22Z

Picked up by the static analyzer Facebook Infer which I was playing around with for another research project. Just adding some asserts before dereferencing potentially null pointers.

JeremyRubin · 2017-09-05T23:38:42Z

Seems reasonable, utAck.

laanwj · 2017-09-06T00:01:11Z

src/addrdb.cpp

@@ -49,7 +49,10 @@ bool SerializeFileDB(const std::string& prefix, const fs::path& path, const Data
        return error("%s: Failed to open file %s", __func__, pathTmp.string());

    // Serialize
-    if (!SerializeDB(fileout, data)) return false;
+    if (!SerializeDB(fileout, data)) {
+        fileout.fclose();


This is an autofile - it closes automatically on release. So this is redundant.
The only reason for closing it explicitly below is because of the RenameOver after.

Maybe remove explicit close and move fileout to an inner scope?

practicalswift · 2017-09-06T08:41:43Z

utACK modulo the autofile fix which is redundant.

Generally I think it is a good idea to add assert(…):s where it helps static analyzers understand the code better. It makes implicit assumptions explicit which helps static analyzers and humans alike to understand and reason about the code.

My experience is that if a code path makes a static analyzer confused it is very likely to be confusing for humans too. This holds even in a lot of cases where it could be argued that the static analyzer should be "smarter" and in some way misunderstands the code. Confusion leads to bugs, so better avoid confusion by liberal use of assert:s and other mechanisms to make tacit assumptions explicit.

meshcollider · 2017-09-06T12:26:25Z

Removed redundant file close as requested, thanks for the reviews :)

practicalswift · 2017-09-06T12:29:42Z

utACK c001992

promag · 2017-09-06T13:03:27Z

utACK c001992.

laanwj · 2017-09-06T19:01:15Z

Can you please change the title to Add nullptr assertions or such? The current title is incorrect, as adding assertions does not fix anything.

laanwj · 2017-09-06T21:50:55Z

utACK c001992

c001992 Fix potential null dereferences (MeshCollider) Pull request description: Picked up by the static analyzer [Facebook Infer](http://fbinfer.com/) which I was playing around with for another research project. Just adding some asserts before dereferencing potentially null pointers. Tree-SHA512: 9c01dab2d21bce75c7c7ef867236654ab538318a1fb39f96f09cdd2382a05be1a6b2db0a1169a94168864e82ffeae0686a383db6eba799742bdd89c37ac74397

7a5d181 Use the character based overload for std::string::find. (Alin Rus) c19401b Don't use pass by reference to const for cheaply-copied types (bool, char, etc.). (practicalswift) 4c5fe36 [Refactor] Remove unused fQuit var from checkqueue.h (donaloconnor) fda7a5f Cleanup: remove unneeded header includes (random-zebra) ac2476c Add test cases covering the relevant key length boundaries: 64 bytes +/- 1 byte for HMAC-SHA256 and 128 bytes +/- 1 byte for HMAC-SHA512 (practicalswift) a346262 Fix code constness in CBlockIndex::GetAncestor() overloads (Dan Raviv) 65e3f4e Refactor: More range-based for loops (random-zebra) dd3d3c4 Use range-based for loops (C++11) when looping over map elements (practicalswift) 5a7750a Move RPC registration out of AppInitParameterInteraction (Russell Yanofsky) 402b4c4 Use compile-time constants instead of unnamed enumerations (practicalswift) bbac2d0 [Trivial] Fix indentation in coins.cpp (random-zebra) e539c62 Small refactor of CCoinsViewCache::BatchWrite() (Dan Raviv) ec91759 Use MakeUnique<T>(...) instead of std::unique_ptr<T>(new T(...)) (random-zebra) 93487b1 Use unique_ptr for pcoinscatcher/pcoinsdbview/pcoinsTip/pblocktree (random-zebra) ff43d69 Use unique_ptr for pdbCopy (Db) and fix potential memory leak (practicalswift) b4d9641 Use unique_ptr for dbenv (DbEnv) (practicalswift) 36108b9 Use unique_ptr for pfilter (CBloomFilter) (practicalswift) ff1c454 Use unique_ptr for sem{Addnode,Outbound} (CSemaphore) (practicalswift) 93daf17 Use unique_ptr for httpRPCTimerInterface (HTTPRPCTimerInterface) (practicalswift) 020ac16 Init: Remove redundant exit(EXIT_FAILURE) instances and replace with (random-zebra) b9f5d1f Remove duplicate uriParts.size() > 0 check (practicalswift) 440d961 Remove redundant check (!ecc is always true) (practicalswift) bfd295b Remove redundant NULL checks after new (practicalswift) 97aad32 Make fUseCrypto atomic (MeshCollider) 2711f78 Consistent parameter names in txdb.h (MeshCollider) d40df3a Fix race for mapBlockIndex in AppInitMain (random-zebra) 03b7766 Cleanup: remove unused functions to Hash the concat of 4 or more objects (random-zebra) c520e0f Remove some unused functions and methods (Pieter Wuille) 508f1a1 range-based loops and const qualifications in net.cpp (Marko Bencun) 79b1e50 Refactor: implement CPubKey::data() (random-zebra) 614d26c Refactor: more &vec[0] to vec.data() (random-zebra) 02b6337 Changing &vec[0] to vec.data(), what 9804 missed (MeshCollider) c1c8b05 Ensure that data types are consistent (jjz) 732bb9d Fix potential null dereferences (MeshCollider) 80f35f9 Remove unreachable code (practicalswift) Pull request description: This is a collection of simple refactorings coming from upstream Bitcoin v0.16 (adapting/extending to PIVX-specific code where needed). Pull requests backported: - bitcoin#10845 (practicalswift) - bitcoin#11238 (MeshCollider) - bitcoin#11232 (jjz) - bitcoin#10793 (MeshCollider) - bitcoin#10888 (benma) - ~~bitcoin#11351 (danra)~~ [edit: removed - included in #2423] - bitcoin#11385 (sipa) - bitcoin#11107 (MeshCollider) - bitcoin#10898 (practicalswift) - bitcoin#11511 (donaloconnor) - bitcoin#11043 (practicalswift) - bitcoin#11353 (danra) - bitcoin#10749 (practicalswift) - bitcoin#11603 (ryanofsky) - bitcoin#10493 (practicalswift) - bitcoin#11337 (danra) - bitcoin#11516 (practicalswift) - bitcoin#10574 (practicalswift) - bitcoin#12108 (donaloconnor) - bitcoin#10839 (practicalswift) - bitcoin#12159 (kekimusmaximus) ACKs for top commit: Fuzzbawls: ACK 7a5d181 furszy: re-ACK 7a5d181 after rebase, no code changes. Merging.. Tree-SHA512: d92f5df47f443391a6531274a2efb9a4882c62d32eff628f795b3abce703f108c8b40ec80ac841cde6c5fdd5c9ff2b6056a31546ac2edda279f5f18fccc99c32

Fix potential null dereferences

c001992

fanquake added the Refactoring label Sep 5, 2017

laanwj reviewed Sep 6, 2017

View reviewed changes

meshcollider changed the title ~~Fix potential null deference and resource leaks~~ Add assertions before potential null deferences Sep 6, 2017

laanwj merged commit c001992 into bitcoin:master Sep 6, 2017

meshcollider deleted the 201708_fbinfer_fixes branch September 7, 2017 04:57

random-zebra mentioned this pull request Jun 29, 2021

[Refactoring] Bitcoin 0.16 cherries PIVX-Project/PIVX#2462

Merged

bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add assertions before potential null deferences #11238

Add assertions before potential null deferences #11238

meshcollider commented Sep 5, 2017 •

edited

JeremyRubin commented Sep 5, 2017

laanwj Sep 6, 2017 •

edited

promag Sep 6, 2017

practicalswift commented Sep 6, 2017 •

edited

meshcollider commented Sep 6, 2017

practicalswift commented Sep 6, 2017

promag commented Sep 6, 2017

laanwj commented Sep 6, 2017

laanwj commented Sep 6, 2017

Add assertions before potential null deferences #11238

Add assertions before potential null deferences #11238

Conversation

meshcollider commented Sep 5, 2017 • edited

JeremyRubin commented Sep 5, 2017

laanwj Sep 6, 2017 • edited

Choose a reason for hiding this comment

promag Sep 6, 2017

Choose a reason for hiding this comment

practicalswift commented Sep 6, 2017 • edited

meshcollider commented Sep 6, 2017

practicalswift commented Sep 6, 2017

promag commented Sep 6, 2017

laanwj commented Sep 6, 2017

laanwj commented Sep 6, 2017

meshcollider commented Sep 5, 2017 •

edited

laanwj Sep 6, 2017 •

edited

practicalswift commented Sep 6, 2017 •

edited