Skip to content

Commit d01e345

Browse files
author
farfromrefug
committed
fix: prevent crash when using setExtra/setTag with a null value
1 parent 87e1e16 commit d01e345

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

src/sentry/wrapper.android.ts

+10-2
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,11 @@ export namespace NATIVE {
869869
return;
870870
}
871871
runOnScope((scope) => {
872-
scope.setTag(key, value);
872+
if (value){
873+
scope.setTag(key, value);
874+
} else {
875+
scope.removeTag(key);
876+
}
873877
});
874878
}
875879

@@ -878,7 +882,11 @@ export namespace NATIVE {
878882
return;
879883
}
880884
runOnScope((scope) => {
881-
scope.setExtra(key, extra);
885+
if (extra) {
886+
scope.setExtra(key, extra);
887+
} else {
888+
scope.removeExtra(key);
889+
}
882890
});
883891
}
884892

src/sentry/wrapper.ios.ts

+10-2
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,11 @@ export namespace NATIVE {
536536
return;
537537
}
538538
NSSentrySDK.configureScope((scope: SentryScope) => {
539-
scope.setTagValueForKey(value, key);
539+
if (value){
540+
scope.setTagValueForKey(key, value);
541+
} else {
542+
scope.removeTagForKey(key);
543+
}
540544
});
541545
}
542546

@@ -545,7 +549,11 @@ export namespace NATIVE {
545549
return;
546550
}
547551
NSSentrySDK.configureScope((scope: SentryScope) => {
548-
scope.setExtraValueForKey(extra, key);
552+
if (extra) {
553+
scope.setExtraValueForKey(key, extra);
554+
} else {
555+
scope.removeContextForKey(key);
556+
}
549557
});
550558
}
551559

0 commit comments

Comments
 (0)