diff options
| author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-12-19 15:09:10 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-12-19 15:09:10 +1100 |
| commit | 4a185996c83862c2e4b911ce637591c4ff535108 (patch) | |
| tree | 90054641b4553601420173e54f1a39db2929e6ef /src/third_party/wiredtiger/src/meta | |
| parent | caba732fb722d5c2257d17dd09dec8a826c13795 (diff) | |
| download | mongo-4a185996c83862c2e4b911ce637591c4ff535108.tar.gz | |
Import wiredtiger: 8d2324943364286056ae399043f70b8a937de312 from branch mongodb-3.6
ref: 1b6c815a3f..8d23249433
for: 3.5.2
SERVER-26545 Remove fixed-size limitation on WiredTiger hazard pointers
WT-2402 Misaligned structure accesses lead to undefined behavior
WT-283 Add a way to change persistent object settings
WT-3056 For cursors with projections, keys should be allowed
WT-3061 syscall test runs with checkpoint_sync=false and doesn't acknowledge pwrite64
WT-3066 lint
WT-3068 Copy wtperf artifacts when running Jenkins tests
WT-3069 Fix build failures in LevelDB APIs
WT-3070 Fix search_near() for index cursor
WT-3071 Java: fix build with -Werror=sign-conversion
WT-3075 Document and enforce that WiredTiger now depends on Python 2.7
WT-3078 Fix a hang in the reconfiguration test.
WT-3084 Fix Coverity resource leak complaint.
Diffstat (limited to 'src/third_party/wiredtiger/src/meta')
| -rw-r--r-- | src/third_party/wiredtiger/src/meta/meta_table.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/src/meta/meta_table.c b/src/third_party/wiredtiger/src/meta/meta_table.c index 71be2496678..4f60728b2d2 100644 --- a/src/third_party/wiredtiger/src/meta/meta_table.c +++ b/src/third_party/wiredtiger/src/meta/meta_table.c @@ -262,8 +262,17 @@ __wt_metadata_search(WT_SESSION_IMPL *session, const char *key, char **valuep) key, WT_META_TRACKING(session) ? "true" : "false", __metadata_turtle(key) ? "" : "not "); - if (__metadata_turtle(key)) - return (__wt_turtle_read(session, key, valuep)); + if (__metadata_turtle(key)) { + /* + * The returned value should only be set if ret is non-zero, but + * Coverity is convinced otherwise. The code path is used enough + * that Coverity complains a lot, add an error check to get some + * peace and quiet. + */ + if ((ret = __wt_turtle_read(session, key, valuep)) != 0) + __wt_free(session, *valuep); + return (ret); + } /* * All metadata reads are at read-uncommitted isolation. That's |