Merge pull request #2520 from gacholio/callback

Ignore unknown JVMTI callbacks
eclipse-openj9 · Jul 31, 2018 · 24e5363 · 24e5363
2 parents 849110a + 0b31810
commit 24e5363
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/runtime/jvmti/jvmtiEventManagement.c b/runtime/jvmti/jvmtiEventManagement.c
@@ -49,10 +49,10 @@ jvmtiSetEventCallbacks(jvmtiEnv* env,
 			JVMTI_ERROR(JVMTI_ERROR_ILLEGAL_ARGUMENT);
 		}
 
-		/* Assume jvmtiEventCallbacks always reflects the largest possible callback table (most current version) */
+		/* Ignore any callbacks which exceed the size of the table of the latest known version in this VM */
 
 		if (size_of_callbacks > sizeof(jvmtiEventCallbacks)) {
-			JVMTI_ERROR(JVMTI_ERROR_ILLEGAL_ARGUMENT);
+			size_of_callbacks = sizeof(jvmtiEventCallbacks);
 		}
 
 		size_of_callbacks /= sizeof(void *);