corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

safety checks to prevent dereferencing null

Browse Source
This commit is contained in:
sspitzer@netscape.com
1999-06-19 21:18:13 +00:00
parent 58d7d53759
commit ae6cfe61f5
12 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
content/base/src/nsStyleSet.cpp
View File

@@ -533,7 +533,10 @@ nsIStyleContext* StyleSetImpl::ResolveStyleFor(nsIPresContext* aPresContext,
if (nsnull != rules) { if (nsnull != rules) {
nsIAtom* medium = nsnull; nsIAtom* medium = nsnull;
NS_ASSERTION(aPresContext, "must have aPresContext");
if (aPresContext) {
aPresContext->GetMedium(&medium); aPresContext->GetMedium(&medium);
}
RulesMatchingData data(aPresContext, medium, aContent, aParentContext, rules); RulesMatchingData data(aPresContext, medium, aContent, aParentContext, rules);
if (mBackstopSheets) { if (mBackstopSheets) {
mBackstopSheets->EnumerateBackwards(EnumRulesMatching, &data); mBackstopSheets->EnumerateBackwards(EnumRulesMatching, &data);

3
content/html/style/src/nsCSSStyleSheet.cpp
View File

@@ -1644,7 +1644,10 @@ PRInt32 CSSStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
PRInt32 matchCount = 0; PRInt32 matchCount = 0;
if (!aPresContext || !aContent || !aResults) return matchCount;
nsIAtom* presMedium = nsnull; nsIAtom* presMedium = nsnull;
aPresContext->GetMedium(&presMedium); aPresContext->GetMedium(&presMedium);
RuleCascadeData* cascade = GetRuleCascade(presMedium); RuleCascadeData* cascade = GetRuleCascade(presMedium);

2
content/html/style/src/nsHTMLCSSStyleSheet.cpp
View File

@@ -425,6 +425,8 @@ PRInt32 HTMLCSSStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
PRInt32 matchCount = 0; PRInt32 matchCount = 0;
if (!aPresContext || !aContent || !aResults) return matchCount;
nsIStyledContent* styledContent; nsIStyledContent* styledContent;
// just get the one and only style rule from the content's STYLE attribute // just get the one and only style rule from the content's STYLE attribute

2
content/html/style/src/nsHTMLStyleSheet.cpp
View File

@@ -553,6 +553,8 @@ PRInt32 HTMLStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
PRInt32 matchCount = 0; PRInt32 matchCount = 0;
if (!aPresContext || !aContent || !aResults) return matchCount;
nsIStyledContent* styledContent; nsIStyledContent* styledContent;
if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::GetIID(), (void**)&styledContent))) { if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::GetIID(), (void**)&styledContent))) {
PRInt32 nameSpace; PRInt32 nameSpace;

3
layout/base/src/nsStyleSet.cpp
View File

@@ -533,7 +533,10 @@ nsIStyleContext* StyleSetImpl::ResolveStyleFor(nsIPresContext* aPresContext,
if (nsnull != rules) { if (nsnull != rules) {
nsIAtom* medium = nsnull; nsIAtom* medium = nsnull;
NS_ASSERTION(aPresContext, "must have aPresContext");
if (aPresContext) {
aPresContext->GetMedium(&medium); aPresContext->GetMedium(&medium);
}
RulesMatchingData data(aPresContext, medium, aContent, aParentContext, rules); RulesMatchingData data(aPresContext, medium, aContent, aParentContext, rules);
if (mBackstopSheets) { if (mBackstopSheets) {
mBackstopSheets->EnumerateBackwards(EnumRulesMatching, &data); mBackstopSheets->EnumerateBackwards(EnumRulesMatching, &data);

3
layout/html/style/src/nsCSSStyleSheet.cpp
View File

@@ -1644,7 +1644,10 @@ PRInt32 CSSStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
PRInt32 matchCount = 0; PRInt32 matchCount = 0;
if (!aPresContext || !aContent || !aResults) return matchCount;
nsIAtom* presMedium = nsnull; nsIAtom* presMedium = nsnull;
aPresContext->GetMedium(&presMedium); aPresContext->GetMedium(&presMedium);
RuleCascadeData* cascade = GetRuleCascade(presMedium); RuleCascadeData* cascade = GetRuleCascade(presMedium);

2
layout/html/style/src/nsHTMLCSSStyleSheet.cpp
View File

@@ -425,6 +425,8 @@ PRInt32 HTMLCSSStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
PRInt32 matchCount = 0; PRInt32 matchCount = 0;
if (!aPresContext || !aContent || !aResults) return matchCount;
nsIStyledContent* styledContent; nsIStyledContent* styledContent;
// just get the one and only style rule from the content's STYLE attribute // just get the one and only style rule from the content's STYLE attribute

2
layout/html/style/src/nsHTMLStyleSheet.cpp
View File

@@ -553,6 +553,8 @@ PRInt32 HTMLStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
PRInt32 matchCount = 0; PRInt32 matchCount = 0;
if (!aPresContext || !aContent || !aResults) return matchCount;
nsIStyledContent* styledContent; nsIStyledContent* styledContent;
if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::GetIID(), (void**)&styledContent))) { if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::GetIID(), (void**)&styledContent))) {
PRInt32 nameSpace; PRInt32 nameSpace;

3
layout/style/nsCSSStyleSheet.cpp
View File

@@ -1644,7 +1644,10 @@ PRInt32 CSSStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
PRInt32 matchCount = 0; PRInt32 matchCount = 0;
if (!aPresContext || !aContent || !aResults) return matchCount;
nsIAtom* presMedium = nsnull; nsIAtom* presMedium = nsnull;
aPresContext->GetMedium(&presMedium); aPresContext->GetMedium(&presMedium);
RuleCascadeData* cascade = GetRuleCascade(presMedium); RuleCascadeData* cascade = GetRuleCascade(presMedium);

2
layout/style/nsHTMLCSSStyleSheet.cpp
View File

@@ -425,6 +425,8 @@ PRInt32 HTMLCSSStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
PRInt32 matchCount = 0; PRInt32 matchCount = 0;
if (!aPresContext || !aContent || !aResults) return matchCount;
nsIStyledContent* styledContent; nsIStyledContent* styledContent;
// just get the one and only style rule from the content's STYLE attribute // just get the one and only style rule from the content's STYLE attribute

2
layout/style/nsHTMLStyleSheet.cpp
View File

@@ -553,6 +553,8 @@ PRInt32 HTMLStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
PRInt32 matchCount = 0; PRInt32 matchCount = 0;
if (!aPresContext || !aContent || !aResults) return matchCount;
nsIStyledContent* styledContent; nsIStyledContent* styledContent;
if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::GetIID(), (void**)&styledContent))) { if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::GetIID(), (void**)&styledContent))) {
PRInt32 nameSpace; PRInt32 nameSpace;

3
layout/style/nsStyleSet.cpp
View File

@@ -533,7 +533,10 @@ nsIStyleContext* StyleSetImpl::ResolveStyleFor(nsIPresContext* aPresContext,
if (nsnull != rules) { if (nsnull != rules) {
nsIAtom* medium = nsnull; nsIAtom* medium = nsnull;
NS_ASSERTION(aPresContext, "must have aPresContext");
if (aPresContext) {
aPresContext->GetMedium(&medium); aPresContext->GetMedium(&medium);
}
RulesMatchingData data(aPresContext, medium, aContent, aParentContext, rules); RulesMatchingData data(aPresContext, medium, aContent, aParentContext, rules);
if (mBackstopSheets) { if (mBackstopSheets) {
mBackstopSheets->EnumerateBackwards(EnumRulesMatching, &data); mBackstopSheets->EnumerateBackwards(EnumRulesMatching, &data);