Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 02:31:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing bug 63967. Fixing a crash that happened when the .src of an image was set and the base URL was not available. r=timeless@mac.com, disttsc@bart.nl, sr=vidur@netscape.com

Browse Source
This commit is contained in:
jst%netscape.com 2001-01-10 22:41:47 +00:00
parent e321773c08
commit adf202b502
2 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
content/html/content/src/nsHTMLImageElement.cpp
View File

@ -116,7 +116,7 @@ public:
protected: protected:
nsresult SetSrcInner(nsIURI* aBaseURL, const nsAReadableString& aSrc); nsresult SetSrcInner(nsIURI* aBaseURL, const nsAReadableString& aSrc);
nsresult GetCallerSourceURL(JSContext* cx, nsIURI** sourceURL); static nsresult GetCallerSourceURL(JSContext* cx, nsIURI** sourceURL);
nsresult GetImageFrame(nsImageFrame** aImageFrame); nsresult GetImageFrame(nsImageFrame** aImageFrame);
@ -609,8 +609,11 @@ nsHTMLImageElement::GetProperty(JSContext *aContext, JSObject *aObj,
{ {
// XXX Security manager needs to be called // XXX Security manager needs to be called
if (JSVAL_IS_STRING(aID)) { if (JSVAL_IS_STRING(aID)) {
char* cString = JS_GetStringBytes(JS_ValueToString(aContext, aID)); PRUnichar* ustr =
if (PL_strcmp("src", cString) == 0) { NS_REINTERPRET_CAST(PRUnichar *,
JS_GetStringChars(JS_ValueToString(aContext, aID)));
if (NS_LITERAL_STRING("src").Equals(ustr)) {
nsAutoString src; nsAutoString src;
if (NS_SUCCEEDED(GetSrc(src))) { if (NS_SUCCEEDED(GetSrc(src))) {
const PRUnichar* bytes = src.GetUnicode(); const PRUnichar* bytes = src.GetUnicode();
@ -648,14 +651,14 @@ nsHTMLImageElement::GetCallerSourceURL(JSContext* cx,
nsCOMPtr<nsIScriptGlobalObject> global; nsCOMPtr<nsIScriptGlobalObject> global;
nsLayoutUtils::GetDynamicScriptGlobal(cx, getter_AddRefs(global)); nsLayoutUtils::GetDynamicScriptGlobal(cx, getter_AddRefs(global));
if (global) { if (global) {
nsCOMPtr<nsIDOMWindowInternal> window = do_QueryInterface(global); nsCOMPtr<nsIDOMWindowInternal> window(do_QueryInterface(global));
if (window) { if (window) {
nsCOMPtr<nsIDOMDocument> domDoc; nsCOMPtr<nsIDOMDocument> domDoc;
result = window->GetDocument(getter_AddRefs(domDoc)); result = window->GetDocument(getter_AddRefs(domDoc));
if (NS_SUCCEEDED(result)) { if (NS_SUCCEEDED(result)) {
nsCOMPtr<nsIDocument> doc = do_QueryInterface(domDoc); nsCOMPtr<nsIDocument> doc(do_QueryInterface(domDoc));
if (doc) { if (doc) {
result = doc->GetBaseURL(*sourceURL); result = doc->GetBaseURL(*sourceURL);
@ -678,28 +681,32 @@ nsHTMLImageElement::SetProperty(JSContext *aContext, JSObject *aObj,
// XXX Security manager needs to be called // XXX Security manager needs to be called
if (JSVAL_IS_STRING(aID)) { if (JSVAL_IS_STRING(aID)) {
char* cString = JS_GetStringBytes(JS_ValueToString(aContext, aID)); PRUnichar* ustr =
NS_REINTERPRET_CAST(PRUnichar *,
if (PL_strcmp("src", cString) == 0) { JS_GetStringChars(JS_ValueToString(aContext, aID)));
if (NS_LITERAL_STRING("src").Equals(ustr)) {
nsCOMPtr<nsIURI> base; nsCOMPtr<nsIURI> base;
nsAutoString src, url; nsAutoString src, url;
// Get the parameter passed in // Get the parameter passed in
JSString *jsstring; JSString *jsstring;
if ((jsstring = JS_ValueToString(aContext, *aVp)) != nsnull) { if ((jsstring = JS_ValueToString(aContext, *aVp))) {
src.Assign(NS_REINTERPRET_CAST(const PRUnichar*, src.Assign(NS_REINTERPRET_CAST(const PRUnichar*,
JS_GetStringChars(jsstring))); JS_GetStringChars(jsstring)));
src.Trim(" \t\n\r"); src.Trim(" \t\n\r");
} }
else {
src.Truncate();
}
// Get the source of the caller // Get the source of the caller
result = GetCallerSourceURL(aContext, getter_AddRefs(base)); result = GetCallerSourceURL(aContext, getter_AddRefs(base));
if (NS_SUCCEEDED(result)) { if (NS_SUCCEEDED(result)) {
result = NS_MakeAbsoluteURI(url, src, base); if (base) {
result = NS_MakeAbsoluteURI(url, src, base);
} else {
url.Assign(src);
}
if (NS_SUCCEEDED(result)) { if (NS_SUCCEEDED(result)) {
result = SetSrcInner(base, url); result = SetSrcInner(base, url);
} }

35
layout/html/content/src/nsHTMLImageElement.cpp
View File

@ -116,7 +116,7 @@ public:
protected: protected:
nsresult SetSrcInner(nsIURI* aBaseURL, const nsAReadableString& aSrc); nsresult SetSrcInner(nsIURI* aBaseURL, const nsAReadableString& aSrc);
nsresult GetCallerSourceURL(JSContext* cx, nsIURI** sourceURL); static nsresult GetCallerSourceURL(JSContext* cx, nsIURI** sourceURL);
nsresult GetImageFrame(nsImageFrame** aImageFrame); nsresult GetImageFrame(nsImageFrame** aImageFrame);
@ -609,8 +609,11 @@ nsHTMLImageElement::GetProperty(JSContext *aContext, JSObject *aObj,
{ {
// XXX Security manager needs to be called // XXX Security manager needs to be called
if (JSVAL_IS_STRING(aID)) { if (JSVAL_IS_STRING(aID)) {
char* cString = JS_GetStringBytes(JS_ValueToString(aContext, aID)); PRUnichar* ustr =
if (PL_strcmp("src", cString) == 0) { NS_REINTERPRET_CAST(PRUnichar *,
JS_GetStringChars(JS_ValueToString(aContext, aID)));
if (NS_LITERAL_STRING("src").Equals(ustr)) {
nsAutoString src; nsAutoString src;
if (NS_SUCCEEDED(GetSrc(src))) { if (NS_SUCCEEDED(GetSrc(src))) {
const PRUnichar* bytes = src.GetUnicode(); const PRUnichar* bytes = src.GetUnicode();
@ -648,14 +651,14 @@ nsHTMLImageElement::GetCallerSourceURL(JSContext* cx,
nsCOMPtr<nsIScriptGlobalObject> global; nsCOMPtr<nsIScriptGlobalObject> global;
nsLayoutUtils::GetDynamicScriptGlobal(cx, getter_AddRefs(global)); nsLayoutUtils::GetDynamicScriptGlobal(cx, getter_AddRefs(global));
if (global) { if (global) {
nsCOMPtr<nsIDOMWindowInternal> window = do_QueryInterface(global); nsCOMPtr<nsIDOMWindowInternal> window(do_QueryInterface(global));
if (window) { if (window) {
nsCOMPtr<nsIDOMDocument> domDoc; nsCOMPtr<nsIDOMDocument> domDoc;
result = window->GetDocument(getter_AddRefs(domDoc)); result = window->GetDocument(getter_AddRefs(domDoc));
if (NS_SUCCEEDED(result)) { if (NS_SUCCEEDED(result)) {
nsCOMPtr<nsIDocument> doc = do_QueryInterface(domDoc); nsCOMPtr<nsIDocument> doc(do_QueryInterface(domDoc));
if (doc) { if (doc) {
result = doc->GetBaseURL(*sourceURL); result = doc->GetBaseURL(*sourceURL);
@ -678,28 +681,32 @@ nsHTMLImageElement::SetProperty(JSContext *aContext, JSObject *aObj,
// XXX Security manager needs to be called // XXX Security manager needs to be called
if (JSVAL_IS_STRING(aID)) { if (JSVAL_IS_STRING(aID)) {
char* cString = JS_GetStringBytes(JS_ValueToString(aContext, aID)); PRUnichar* ustr =
NS_REINTERPRET_CAST(PRUnichar *,
if (PL_strcmp("src", cString) == 0) { JS_GetStringChars(JS_ValueToString(aContext, aID)));
if (NS_LITERAL_STRING("src").Equals(ustr)) {
nsCOMPtr<nsIURI> base; nsCOMPtr<nsIURI> base;
nsAutoString src, url; nsAutoString src, url;
// Get the parameter passed in // Get the parameter passed in
JSString *jsstring; JSString *jsstring;
if ((jsstring = JS_ValueToString(aContext, *aVp)) != nsnull) { if ((jsstring = JS_ValueToString(aContext, *aVp))) {
src.Assign(NS_REINTERPRET_CAST(const PRUnichar*, src.Assign(NS_REINTERPRET_CAST(const PRUnichar*,
JS_GetStringChars(jsstring))); JS_GetStringChars(jsstring)));
src.Trim(" \t\n\r"); src.Trim(" \t\n\r");
} }
else {
src.Truncate();
}
// Get the source of the caller // Get the source of the caller
result = GetCallerSourceURL(aContext, getter_AddRefs(base)); result = GetCallerSourceURL(aContext, getter_AddRefs(base));
if (NS_SUCCEEDED(result)) { if (NS_SUCCEEDED(result)) {
result = NS_MakeAbsoluteURI(url, src, base); if (base) {
result = NS_MakeAbsoluteURI(url, src, base);
} else {
url.Assign(src);
}
if (NS_SUCCEEDED(result)) { if (NS_SUCCEEDED(result)) {
result = SetSrcInner(base, url); result = SetSrcInner(base, url);
} }