summaryrefslogtreecommitdiff
path: root/openssl/crypto/objects/obj_dat.c
diff options
context:
space:
mode:
authordigit@chromium.org <digit@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2013-11-05 17:28:49 +0000
committerdigit@chromium.org <digit@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2013-11-05 17:28:49 +0000
commit08086bd0f0dfbc08d121ccc6fbd27de9eaed55c7 (patch)
treebbf919c22943d537fb9a16aec3aa03278738e256 /openssl/crypto/objects/obj_dat.c
parentfc8760c61cfe4155d0636a956ed70726c4d19dd2 (diff)
downloadopenssl-08086bd0f0dfbc08d121ccc6fbd27de9eaed55c7.tar.gz
sh implementation to avoid unwanted resizes during iteration.
This is a port of the following AOSP patch: https://android-review.googlesource.com/#/c/68853/ It fixes a bug that happens when trying to delete items from a lhash table while it is being iterated over with a call to lh_doall or lh_doall_arg. It looks like the source tree is slightly out-of-sync from the state of running ./import_from_android.sh, but the differences are minor / not significant. This patch tries to fix a P1 bug, so doesn't try to address this (the differences have been removed for easier reviewing). BUG=298606 R=agl@chromium.org,rsleevi@chromium.org,wtc@chromium.org TBR=darin@chromium.org Review URL: https://codereview.chromium.org/59793002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@233017 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'openssl/crypto/objects/obj_dat.c')
-rw-r--r--openssl/crypto/objects/obj_dat.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/openssl/crypto/objects/obj_dat.c b/openssl/crypto/objects/obj_dat.c
index 8a342ba..ef0512a 100644
--- a/openssl/crypto/objects/obj_dat.c
+++ b/openssl/crypto/objects/obj_dat.c
@@ -227,7 +227,6 @@ void OBJ_cleanup(void)
return ;
}
if (added == NULL) return;
- lh_ADDED_OBJ_down_load(added) = 0;
lh_ADDED_OBJ_doall(added,LHASH_DOALL_FN(cleanup1)); /* zero counters */
lh_ADDED_OBJ_doall(added,LHASH_DOALL_FN(cleanup2)); /* set counters */
lh_ADDED_OBJ_doall(added,LHASH_DOALL_FN(cleanup3)); /* free objects */