Skip to content

Commit 9f6c0ea

Browse files
committed
fix: check for errors during the creation of bundle.
1 parent 06e1b04 commit 9f6c0ea

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

analytics/integration_test/src/integration_test.cc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,15 +298,13 @@ TEST_F(FirebaseAnalyticsTest, TestLogEventWithComplexParameters) {
298298
}
299299

300300
TEST_F(FirebaseAnalyticsTest, TestSetDefaultEventParameters) {
301-
const firebase::analytics::Parameter kDefaultParameters[] = {
301+
const std::vector<Parameter> kDefaultParameters = {
302302
firebase::analytics::Parameter("default_parameter_double", 123.456),
303303
firebase::analytics::Parameter("default_parameter_int", 4),
304304
firebase::analytics::Parameter("default_parameter_str", "Hello World"),
305305
};
306306

307-
firebase::analytics::SetDefaultEventParameters(
308-
kDefaultParameters,
309-
sizeof(kDefaultParameters) / sizeof(kDefaultParameters[0]));
307+
firebase::analytics::SetDefaultEventParameters(kDefaultParameters);
310308
firebase::analytics::LogEvent("default_parameter_event");
311309
firebase::analytics::SetDefaultEventParameters(nullptr, 0);
312310
}

analytics/src/analytics_android.cc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,12 @@ void SetDefaultEventParameters(const Parameter* parameters,
545545
jobject bundle =
546546
env->NewObject(util::bundle::GetClass(),
547547
util::bundle::GetMethodId(util::bundle::kConstructor));
548+
if (util::CheckAndClearJniExceptions(env) || !bundle) {
549+
LogError("Failed to create bundle for SetDefaultEventParameters.");
550+
if (bundle) env->DeleteLocalRef(bundle);
551+
return;
552+
}
553+
548554
for (size_t i = 0; i < number_of_parameters; ++i) {
549555
const Parameter& parameter = parameters[i];
550556
if (!AddVariantToBundle(env, bundle, parameter.name, parameter.value)) {

0 commit comments

Comments
 (0)