Skip to content

Commit 9c1b463

Browse files
authored
Merge pull request rdkcentral#5853 from Shiva367/sprint/24Q4
DELIA-66586: WPEFramework crash with signature "WPEFramework::Plugin:Packager::Deinitialize"
2 parents 0f3d844 + eb6ae43 commit 9c1b463

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

Packager/Packager.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ namespace {
5757
_service->Register(&_notification);
5858

5959
string result;
60-
_implementation = _service->Root<Exchange::IPackager>(_connectionId, 2000, _T("PackagerImplementation"));
60+
_implementation = _service->Root<Exchange::IPackager>(_connectionId, 5000, _T("PackagerImplementation"));
6161
if (_implementation == nullptr) {
6262
result = _T("Couldn't create package instance");
6363
_service->Unregister(&_notification);
@@ -73,9 +73,11 @@ namespace {
7373
{
7474
ASSERT(_service == service);
7575

76-
_service->Unregister(&_notification);
76+
if (_service != nullptr) {
77+
_service->Unregister(&_notification);
78+
}
7779

78-
if (_implementation->Release() != Core::ERROR_DESTRUCTION_SUCCEEDED) {
80+
if (_implementation != nullptr && _implementation->Release() != Core::ERROR_DESTRUCTION_SUCCEEDED) {
7981

8082
ASSERT(_connectionId != 0);
8183

0 commit comments

Comments
 (0)