From 3fcb357b806e9b8d8caea3f9dcb02ba2efd96bcc Mon Sep 17 00:00:00 2001 From: "peterl%netscape.com" Date: Wed, 7 Jul 1999 01:32:59 +0000 Subject: [PATCH] cleanup error handling git-svn-id: svn://10.0.0.236/trunk@38554 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/style/src/nsCSSStyleSheet.cpp | 5 ++++- mozilla/layout/html/style/src/nsCSSStyleSheet.cpp | 5 ++++- mozilla/layout/style/nsCSSStyleSheet.cpp | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp index 29b5e454300..a63338ec6e7 100644 --- a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp +++ b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp @@ -1485,7 +1485,10 @@ static PRBool SelectorMatches(nsIPresContext* aPresContext, char *absUrlStr = nsnull; char *urlSpec = href.ToNewCString(); - if (!urlSpec) return NS_ERROR_OUT_OF_MEMORY; + if (!urlSpec) { + NS_RELEASE(baseUri); + return PR_FALSE; + } rv = service->MakeAbsolute(urlSpec, baseUri, &absUrlStr); nsCRT::free(urlSpec); NS_RELEASE(baseUri); diff --git a/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp b/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp index 29b5e454300..a63338ec6e7 100644 --- a/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp +++ b/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp @@ -1485,7 +1485,10 @@ static PRBool SelectorMatches(nsIPresContext* aPresContext, char *absUrlStr = nsnull; char *urlSpec = href.ToNewCString(); - if (!urlSpec) return NS_ERROR_OUT_OF_MEMORY; + if (!urlSpec) { + NS_RELEASE(baseUri); + return PR_FALSE; + } rv = service->MakeAbsolute(urlSpec, baseUri, &absUrlStr); nsCRT::free(urlSpec); NS_RELEASE(baseUri); diff --git a/mozilla/layout/style/nsCSSStyleSheet.cpp b/mozilla/layout/style/nsCSSStyleSheet.cpp index 29b5e454300..a63338ec6e7 100644 --- a/mozilla/layout/style/nsCSSStyleSheet.cpp +++ b/mozilla/layout/style/nsCSSStyleSheet.cpp @@ -1485,7 +1485,10 @@ static PRBool SelectorMatches(nsIPresContext* aPresContext, char *absUrlStr = nsnull; char *urlSpec = href.ToNewCString(); - if (!urlSpec) return NS_ERROR_OUT_OF_MEMORY; + if (!urlSpec) { + NS_RELEASE(baseUri); + return PR_FALSE; + } rv = service->MakeAbsolute(urlSpec, baseUri, &absUrlStr); nsCRT::free(urlSpec); NS_RELEASE(baseUri);