diff -r 800203832575 -r 30342f40acbf webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp --- a/webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp Mon Jun 21 16:54:17 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp Thu Jul 15 19:53:20 2010 +0300 @@ -332,13 +332,13 @@ case NPNVPluginElementNPObject: { PluginWin* pluginWin = (PluginWin*)aInstance->ndata; - WebCore::Element* pluginElement; + WebCore::Element* pluginElement = NULL; if (pluginWin) { pluginElement = pluginWin->pluginSkin()->getElement(); } NPObject* pluginScriptObject = 0; - if (pluginElement->hasTagName(appletTag) || pluginElement->hasTagName(embedTag) || pluginElement->hasTagName(objectTag)) + if (pluginElement && (pluginElement->hasTagName(appletTag) || pluginElement->hasTagName(embedTag) || pluginElement->hasTagName(objectTag))) pluginScriptObject = static_cast(pluginElement)->getNPObject(); if (pluginScriptObject) @@ -369,13 +369,14 @@ case NPNVisOfflineBool: // Tells whether offline mode is enabled; // true=offline mode enabled, false=not enabled - case NPNNetworkAccess: + case NPNNetworkAccess: { PluginWin* pluginWin = (PluginWin*)aInstance->ndata; TInt apId = -1; if (pluginWin) { apId = pluginWin->pluginSkin()->handleNetworkAccess(); } *((TInt*) aRetValue) = apId; + } break; case NPNVGenericParameter: { @@ -478,6 +479,7 @@ break; } case NPPVPluginBitmap : + { PluginWin* pluginWin = (PluginWin*)aInstance->ndata; if (pluginWin) { TInt* bitMapHandle = (TInt*)aSetValue; @@ -489,6 +491,7 @@ { pluginWin->SetBitmapFromPlugin(KErrNone); } + } } break; case NPPVPluginDeactivate: