Fixing Crash bug 53258 - crash with inline image viewing - r: sspitzer - PDT approval

This commit is contained in:
rhp%netscape.com 2000-09-27 21:09:19 +00:00
parent cac0f1f372
commit bcf9ec7a35
2 changed files with 9 additions and 0 deletions

View File

@ -110,6 +110,7 @@ nsresult
bridge_new_new_uri(void *bridgeStream, nsIURI *aURI, PRInt32 aOutputType)
{
nsMIMESession *session = (nsMIMESession *)bridgeStream;
const char **fixup_pointer = nsnull;
if (session)
{
@ -128,6 +129,7 @@ bridge_new_new_uri(void *bridgeStream, nsIURI *aURI, PRInt32 aOutputType)
default_charset = &(mdd->options->default_charset);
override_charset = &(mdd->options->override_charset);
url_name = &(mdd->url_name);
fixup_pointer = &(mdd->options->url);
}
}
else
@ -139,6 +141,7 @@ bridge_new_new_uri(void *bridgeStream, nsIURI *aURI, PRInt32 aOutputType)
default_charset = &(msd->options->default_charset);
override_charset = &(msd->options->override_charset);
url_name = &(msd->url_name);
fixup_pointer = &(msd->options->url);
}
}
@ -190,6 +193,8 @@ bridge_new_new_uri(void *bridgeStream, nsIURI *aURI, PRInt32 aOutputType)
if (!(*url_name))
return NS_ERROR_OUT_OF_MEMORY;
// rhp: Ugh, this is ugly...but it works.
*fixup_pointer = (const char *)*url_name;
CRTFREEIF(urlString);
}
}

View File

@ -368,6 +368,10 @@ public:
NS_IMETHOD OpenDiskFile(nsFileSpec fs);
NS_IMETHOD PumpFileStream();
NS_IMETHOD ReadSegments(nsWriteSegmentFun writer, void * closure, PRUint32 count, PRUint32 *_retval) {return NS_OK;};
NS_IMETHOD GetNonBlocking(PRBool *aNonBlocking) {return NS_OK;};
NS_IMETHOD GetObserver(nsIInputStreamObserver * *aObserver) {return NS_OK;};
NS_IMETHOD SetObserver(nsIInputStreamObserver * aObserver) {return NS_OK;};
private:
PRUint32 mBufLen;