diff options
author | Sverker Eriksson <sverker@erlang.org> | 2010-01-25 13:37:18 +0000 |
---|---|---|
committer | Erlang/OTP <otp@erlang.org> | 2010-01-25 13:37:18 +0000 |
commit | 064ce3bdefa6ffa795c3ed5e7ceb7722664722d3 (patch) | |
tree | a2dabefdbdf8c3806c1011cd17d9bf6a9e0f699b /erts/emulator/beam | |
parent | e19d6e4463a9cc3b738fd32a46e0ce9282a70fd5 (diff) | |
download | otp-064ce3bdefa6ffa795c3ed5e7ceb7722664722d3.tar.gz otp-064ce3bdefa6ffa795c3ed5e7ceb7722664722d3.tar.bz2 otp-064ce3bdefa6ffa795c3ed5e7ceb7722664722d3.zip |
OTP-8377 ETS bug causing the memory counter from ets:info for
ordered_set's to sometimes get out of synch and absurdly high.
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r-- | erts/emulator/beam/erl_db_tree.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/erts/emulator/beam/erl_db_tree.c b/erts/emulator/beam/erl_db_tree.c index d3a916d2d9..b421da591b 100644 --- a/erts/emulator/beam/erl_db_tree.c +++ b/erts/emulator/beam/erl_db_tree.c @@ -1,19 +1,19 @@ /* * %CopyrightBegin% - * - * Copyright Ericsson AB 1998-2009. All Rights Reserved. - * + * + * Copyright Ericsson AB 1998-2010. All Rights Reserved. + * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in * compliance with the License. You should have received a copy of the * Erlang Public License along with this software. If not, it can be * retrieved online at http://www.erlang.org/. - * + * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See * the License for the specific language governing rights and limitations * under the License. - * + * * %CopyrightEnd% */ @@ -2529,7 +2529,9 @@ static TreeDbTerm *find_node(DbTableTree *tb, Eterm key) this = this->right; } } - release_stack(tb,stack); + if (stack) { + release_stack(tb,stack); + } return this; } |