Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Patch from alecf to do a null pointer check on argument to GetSelectedIndex().

Browse Source
This commit is contained in:
nisheeth%netscape.com 1999-06-05 00:18:58 +00:00
parent 6da324eafb
commit c670e17ce2
2 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
layout/forms/nsListControlFrame.cpp
View File

@ -544,31 +544,33 @@ void nsListControlFrame::DisplayDeselected(nsIContent* aContent)
PRInt32 nsListControlFrame::GetSelectedIndex(nsIFrame *aHitFrame)
{
PRInt32 index = kNothingSelected;
// Get the content of the frame that was selected
// Get the content of the frame that was selected
nsIContent* selectedContent = nsnull;
aHitFrame->GetContent(&selectedContent);
NS_ASSERTION(aHitFrame, "No frame for html <select> element\n");
if (aHitFrame) {
aHitFrame->GetContent(&selectedContent);
// Search the list of option elements looking for a match
// Search the list of option elements looking for a match
PRUint32 length = GetNumberOfOptions();
nsIDOMHTMLCollection* options = GetOptions(mContent);
if (nsnull != options) {
PRUint32 numOptions;
options->GetLength(&numOptions);
for (PRUint32 optionX = 0; optionX < numOptions; optionX++) {
nsIContent* option = nsnull;
option = GetOptionAsContent(options, optionX);
if (nsnull != option) {
if (option == selectedContent) {
index = optionX;
break;
PRUint32 length = GetNumberOfOptions();
nsIDOMHTMLCollection* options = GetOptions(mContent);
if (nsnull != options) {
PRUint32 numOptions;
options->GetLength(&numOptions);
for (PRUint32 optionX = 0; optionX < numOptions; optionX++) {
nsIContent* option = nsnull;
option = GetOptionAsContent(options, optionX);
if (nsnull != option) {
if (option == selectedContent) {
index = optionX;
break;
}
NS_RELEASE(option);
}
NS_RELEASE(option);
}
NS_RELEASE(options);
}
NS_RELEASE(options);
}
return index;
}

38
layout/html/forms/src/nsListControlFrame.cpp
View File

@ -544,31 +544,33 @@ void nsListControlFrame::DisplayDeselected(nsIContent* aContent)
PRInt32 nsListControlFrame::GetSelectedIndex(nsIFrame *aHitFrame)
{
PRInt32 index = kNothingSelected;
// Get the content of the frame that was selected
// Get the content of the frame that was selected
nsIContent* selectedContent = nsnull;
aHitFrame->GetContent(&selectedContent);
NS_ASSERTION(aHitFrame, "No frame for html <select> element\n");
if (aHitFrame) {
aHitFrame->GetContent(&selectedContent);
// Search the list of option elements looking for a match
// Search the list of option elements looking for a match
PRUint32 length = GetNumberOfOptions();
nsIDOMHTMLCollection* options = GetOptions(mContent);
if (nsnull != options) {
PRUint32 numOptions;
options->GetLength(&numOptions);
for (PRUint32 optionX = 0; optionX < numOptions; optionX++) {
nsIContent* option = nsnull;
option = GetOptionAsContent(options, optionX);
if (nsnull != option) {
if (option == selectedContent) {
index = optionX;
break;
PRUint32 length = GetNumberOfOptions();
nsIDOMHTMLCollection* options = GetOptions(mContent);
if (nsnull != options) {
PRUint32 numOptions;
options->GetLength(&numOptions);
for (PRUint32 optionX = 0; optionX < numOptions; optionX++) {
nsIContent* option = nsnull;
option = GetOptionAsContent(options, optionX);
if (nsnull != option) {
if (option == selectedContent) {
index = optionX;
break;
}
NS_RELEASE(option);
}
NS_RELEASE(option);
}
NS_RELEASE(options);
}
NS_RELEASE(options);
}
return index;
}