diff options
| author | Sverker Eriksson <[email protected]> | 2012-08-15 21:00:37 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-08-15 21:00:37 +0200 |
| commit | 68e0078eb58803dc4a7e0bfd801f32c2c92b7f26 (patch) | |
| tree | 982ae87e5232a392b576fd2bedf65ef401664e26 | |
| parent | 125f494f3a0e31502d209fd050d16f47b9d417da (diff) | |
| parent | 29921882be8873f763f6135badc864442de74304 (diff) | |
| download | otp-68e0078eb58803dc4a7e0bfd801f32c2c92b7f26.tar.gz otp-68e0078eb58803dc4a7e0bfd801f32c2c92b7f26.tar.bz2 otp-68e0078eb58803dc4a7e0bfd801f32c2c92b7f26.zip | |
Merge branch 'sverk/ets-compressed-binary-bug/OTP-10182' into maint
* sverk/ets-compressed-binary-bug/OTP-10182:
Fix corrupted binaries in compressed ETS tables
Make ETS compile with #define DEBUG_CLONE
| -rw-r--r-- | erts/emulator/beam/erl_db_util.c | 4 | ||||
| -rw-r--r-- | erts/emulator/beam/external.c | 2 | ||||
| -rw-r--r-- | lib/stdlib/test/ets_SUITE.erl | 16 |
3 files changed, 20 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c index c2f6cfa933..1aa0cb4552 100644 --- a/erts/emulator/beam/erl_db_util.c +++ b/erts/emulator/beam/erl_db_util.c @@ -2995,7 +2995,7 @@ Eterm db_copy_from_comp(DbTableCommon* tb, DbTerm* bp, Eterm** hpp, } ASSERT((*hpp - hp) <= bp->size); #ifdef DEBUG_CLONE - ASSERT(eq_rel(make_tuple(hp),make_tuple(bp->debug_clone),bp->debug_clone)); + ASSERT(eq_rel(make_tuple(hp),NULL,make_tuple(bp->debug_clone),bp->debug_clone)); #endif return make_tuple(hp); } @@ -3018,7 +3018,7 @@ Eterm db_copy_element_from_ets(DbTableCommon* tb, Process* p, hp += extra; HRelease(p, endp, hp); #ifdef DEBUG_CLONE - ASSERT(eq_rel(copy, obj->debug_clone[pos], obj->debug_clone)); + ASSERT(eq_rel(copy, NULL, obj->debug_clone[pos], obj->debug_clone)); #endif return copy; } diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c index 4348578694..52f45b924f 100644 --- a/erts/emulator/beam/external.c +++ b/erts/emulator/beam/external.c @@ -1889,7 +1889,9 @@ enc_term(ErtsAtomCacheMap *acmp, Eterm obj, byte* ep, Uint32 dflags, *ep++ = BINARY_INTERNAL_REF; } if (pb->flags) { + char* before_realloc = pb->val->orig_bytes; erts_emasculate_writable_binary(pb); + bytes += (pb->val->orig_bytes - before_realloc); } erts_refc_inc(&pb->val->refc, 2); diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl index 297c4ec1c9..97ac433cb9 100644 --- a/lib/stdlib/test/ets_SUITE.erl +++ b/lib/stdlib/test/ets_SUITE.erl @@ -74,6 +74,7 @@ -export([bad_table/1, types/1]). -export([otp_9932/1]). -export([otp_9423/1]). +-export([otp_10182/1]). -export([init_per_testcase/2, end_per_testcase/2]). %% Convenience for manual testing @@ -146,6 +147,7 @@ all() -> exit_many_large_table_owner, exit_many_tables_owner, exit_many_many_tables_owner, write_concurrency, heir, give_away, setopts, bad_table, types, + otp_10182, otp_9932, otp_9423]. @@ -5470,6 +5472,20 @@ otp_9423(Config) when is_list(Config) -> Skipped -> Skipped end. + +%% Corrupted binary in compressed table +otp_10182(Config) when is_list(Config) -> + Bin = <<"aHR0cDovL2hvb3RzdWl0ZS5jb20vYy9wcm8tYWRyb2xsLWFi">>, + Key = {test, Bin}, + Value = base64:decode(Bin), + In = {Key,Value}, + Db = ets:new(undefined, [set, protected, {read_concurrency, true}, compressed]), + ets:insert(Db, In), + [Out] = ets:lookup(Db, Key), + io:format("In : ~p\nOut: ~p\n", [In,Out]), + ets:delete(Db), + In = Out. + |