@@ -165,7 +165,7 @@ napi_value TemplatedInstanceCallback(napi_env env,
165
165
return details::WrapCallback ([&] {
166
166
CallbackInfo cbInfo (env, info);
167
167
T* instance = T::Unwrap (cbInfo.This ().As <Object>());
168
- return (instance->*UnwrapCallback)(cbInfo);
168
+ return instance ? (instance->*UnwrapCallback)(cbInfo) : nullptr ;
169
169
});
170
170
}
171
171
@@ -175,7 +175,7 @@ napi_value TemplatedInstanceVoidCallback(napi_env env, napi_callback_info info)
175
175
return details::WrapCallback ([&] {
176
176
CallbackInfo cbInfo (env, info);
177
177
T* instance = T::Unwrap (cbInfo.This ().As <Object>());
178
- (instance->*UnwrapCallback)(cbInfo);
178
+ if (instance) (instance->*UnwrapCallback)(cbInfo);
179
179
return nullptr ;
180
180
});
181
181
}
@@ -4340,7 +4340,7 @@ inline napi_value InstanceWrap<T>::InstanceVoidMethodCallbackWrapper(
4340
4340
callbackInfo.SetData (callbackData->data );
4341
4341
T* instance = T::Unwrap (callbackInfo.This ().As <Object>());
4342
4342
auto cb = callbackData->callback ;
4343
- (instance->*cb)(callbackInfo);
4343
+ if (instance) (instance->*cb)(callbackInfo);
4344
4344
return nullptr ;
4345
4345
});
4346
4346
}
@@ -4355,7 +4355,7 @@ inline napi_value InstanceWrap<T>::InstanceMethodCallbackWrapper(
4355
4355
callbackInfo.SetData (callbackData->data );
4356
4356
T* instance = T::Unwrap (callbackInfo.This ().As <Object>());
4357
4357
auto cb = callbackData->callback ;
4358
- return (instance->*cb)(callbackInfo);
4358
+ return instance ? (instance->*cb)(callbackInfo) : nullptr ;
4359
4359
});
4360
4360
}
4361
4361
@@ -4369,7 +4369,7 @@ inline napi_value InstanceWrap<T>::InstanceGetterCallbackWrapper(
4369
4369
callbackInfo.SetData (callbackData->data );
4370
4370
T* instance = T::Unwrap (callbackInfo.This ().As <Object>());
4371
4371
auto cb = callbackData->getterCallback ;
4372
- return (instance->*cb)(callbackInfo);
4372
+ return instance ? (instance->*cb)(callbackInfo) : nullptr ;
4373
4373
});
4374
4374
}
4375
4375
@@ -4383,7 +4383,7 @@ inline napi_value InstanceWrap<T>::InstanceSetterCallbackWrapper(
4383
4383
callbackInfo.SetData (callbackData->data );
4384
4384
T* instance = T::Unwrap (callbackInfo.This ().As <Object>());
4385
4385
auto cb = callbackData->setterCallback ;
4386
- (instance->*cb)(callbackInfo, callbackInfo[0 ]);
4386
+ if (instance) (instance->*cb)(callbackInfo, callbackInfo[0 ]);
4387
4387
return nullptr ;
4388
4388
});
4389
4389
}
@@ -4395,7 +4395,7 @@ inline napi_value InstanceWrap<T>::WrappedMethod(
4395
4395
return details::WrapCallback ([&] {
4396
4396
const CallbackInfo cbInfo (env, info);
4397
4397
T* instance = T::Unwrap (cbInfo.This ().As <Object>());
4398
- (instance->*method)(cbInfo, cbInfo[0 ]);
4398
+ if (instance) (instance->*method)(cbInfo, cbInfo[0 ]);
4399
4399
return nullptr ;
4400
4400
});
4401
4401
}
0 commit comments