From 9d98a089756b692eefeae7f92cca15e121196e0c Mon Sep 17 00:00:00 2001 From: Manuel Roman Date: Wed, 23 May 2012 14:25:31 -0700 Subject: Check result handler is not null If caller passes a null result handler to the proxy methods, we need to check it when getting the result. Otherwise we try to invoke a method on a null object Change-Id: Ic2f456c36cb542b782b6a6d0d4d607ccf0987496 --- tools/aidl/generate_java_rpc.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tools/aidl/generate_java_rpc.cpp') diff --git a/tools/aidl/generate_java_rpc.cpp b/tools/aidl/generate_java_rpc.cpp index 2b50b769333a..21ebb1f284ed 100644 --- a/tools/aidl/generate_java_rpc.cpp +++ b/tools/aidl/generate_java_rpc.cpp @@ -784,7 +784,10 @@ generate_result_dispatcher_method(const method_type* method, } // Call the callback method - dispatchMethod->statements->Add(realCall); + IfStatement* ifst = new IfStatement; + ifst->expression = new Comparison(new FieldVariable(THIS_VALUE, "callback"), "!=", NULL_VALUE); + dispatchMethod->statements->Add(ifst); + ifst->statements->Add(realCall); } static void -- cgit v1.2.3