Fix bug in vftablebelongstoclass

Fix #232
cmu-sei · Jul 11, 2022 · cf77c93 · Trass3r · Jul 12, 2022 · sei-eschwartz
1 parent f7af90d
commit cf77c93
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/share/prolog/oorules/rules.pl b/share/prolog/oorules/rules.pl
@@ -981,6 +981,10 @@
     !,
     find(Method, Class),
     factVFTableWrite(Insn, Method, Offset, VFTable),
+    % Verify that this vftable write is in method's this class
+    possibleVFTableWrite(Insn, Method, ThisPtr, Offset, VFTable),
+    funcParameter(Method, ecx, ThisPtr),
+
     VFTableWrite=factVFTableWrite(Insn, Method, Offset, VFTable),
 
     % ejs 10/9/20: We found the destructor rule was applying to a method which we had not
@@ -1078,6 +1082,9 @@
 % Free, _, Free: OK
 reasonVFTableBelongsToClass(VFTable, Offset, Class, Rule, VFTableWrite) :-
     factVFTableWrite(Insn, Method, Offset, VFTable),
+    % Verify that this vftable write is in method's this class
+    possibleVFTableWrite(Insn, Method, ThisPtr, Offset, VFTable),
+    funcParameter(Method, ecx, ThisPtr),
     VFTableWrite=factVFTableWrite(Insn, Method, Offset, VFTable),
     find(Method, Class),