aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomislav Novak <tnovak@meta.com>2023-05-04 18:15:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-04 18:15:54 +0000
commit77b170dcfb7c00cbc3c2dbd0efe0e06ce7a2033e (patch)
tree0a2262cedb9349ae492b1c1618c946119d55e4dd
parent398c731be2a9e2f24baa60293ab56e07f9141961 (diff)
parent50f7c5209c77066138e8f4a31d6808cf1cef7d0d (diff)
downloadoj-libjdwp-77b170dcfb7c00cbc3c2dbd0efe0e06ce7a2033e.tar.gz
libjdwp: fix infinite loop in findNodeByID am: dfc9467465 am: e366bb1de3 am: 0f143f68b7 am: 50f7c5209c
Original change: https://android-review.googlesource.com/c/platform/external/oj-libjdwp/+/2574750 Change-Id: I3d12e5c2ea6575d853b2852dfc92f14a7bcd6cb6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--src/share/back/commonRef.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/share/back/commonRef.c b/src/share/back/commonRef.c
index f00766ff2..053995a89 100644
--- a/src/share/back/commonRef.c
+++ b/src/share/back/commonRef.c
@@ -343,7 +343,9 @@ findNodeByID(JNIEnv *env, jlong id)
if ( node->prev != NULL ) {
/* Re-order hash list so this one is up front */
node->prev->next = node->next;
- node->prev->prev = node->prev;
+ if (node->next != NULL) {
+ node->next->prev = node->prev;
+ }
node->next = gdata->objectsByID[slot];
node->next->prev = node;
node->prev = NULL;