mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 41599 browser crashes when executing function with certain name such as Click(). Fixed by stopping recursion. r=saari.

This commit is contained in:
heikki%netscape.com 2000-08-01 21:40:38 +00:00
Родитель e88d343b75
Коммит 8eb3687fb2
2 изменённых файлов: 24 добавлений и 0 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
content/html/content/src/nsHTMLInputElement.cpp
Просмотреть файл

@ -206,6 +206,8 @@ protected:
mInner.GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::type, tmp); mInner.GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::type, tmp);
return tmp.EqualsIgnoreCase("image"); return tmp.EqualsIgnoreCase("image");
} }
PRBool mHandlingClick;
}; };
// construction, destruction // construction, destruction
@ -233,6 +235,7 @@ nsHTMLInputElement::nsHTMLInputElement(nsINodeInfo *aNodeInfo)
mForm = nsnull; mForm = nsnull;
mSkipFocusEvent = PR_FALSE; mSkipFocusEvent = PR_FALSE;
//nsTraceRefcnt::Create((nsIFormControl*)this, "nsHTMLFormControlElement", __FILE__, __LINE__); //nsTraceRefcnt::Create((nsIFormControl*)this, "nsHTMLFormControlElement", __FILE__, __LINE__);
mHandlingClick = PR_FALSE;
} }
nsHTMLInputElement::~nsHTMLInputElement() nsHTMLInputElement::~nsHTMLInputElement()
@ -740,6 +743,9 @@ nsHTMLInputElement::Click()
{ {
nsresult rv = NS_OK; nsresult rv = NS_OK;
if (mHandlingClick) // Fixes crash as in bug 41599 --heikki@netscape.com
return rv;
// first see if we are disabled or not. If disabled then do nothing. // first see if we are disabled or not. If disabled then do nothing.
nsAutoString disabled; nsAutoString disabled;
if (NS_CONTENT_ATTR_HAS_VALUE == mInner.GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::disabled, disabled)) { if (NS_CONTENT_ATTR_HAS_VALUE == mInner.GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::disabled, disabled)) {
@ -775,12 +781,18 @@ nsHTMLInputElement::Click()
event.isMeta = PR_FALSE; event.isMeta = PR_FALSE;
event.clickCount = 0; event.clickCount = 0;
event.widget = nsnull; event.widget = nsnull;
mHandlingClick = PR_TRUE;
rv = HandleDOMEvent(context, &event, nsnull, NS_EVENT_FLAG_INIT, &status); rv = HandleDOMEvent(context, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
mHandlingClick = PR_FALSE;
} }
} }
} }
} }
} }
return rv; return rv;
} }

12
layout/html/content/src/nsHTMLInputElement.cpp
Просмотреть файл

@ -206,6 +206,8 @@ protected:
mInner.GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::type, tmp); mInner.GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::type, tmp);
return tmp.EqualsIgnoreCase("image"); return tmp.EqualsIgnoreCase("image");
} }
PRBool mHandlingClick;
}; };
// construction, destruction // construction, destruction
@ -233,6 +235,7 @@ nsHTMLInputElement::nsHTMLInputElement(nsINodeInfo *aNodeInfo)
mForm = nsnull; mForm = nsnull;
mSkipFocusEvent = PR_FALSE; mSkipFocusEvent = PR_FALSE;
//nsTraceRefcnt::Create((nsIFormControl*)this, "nsHTMLFormControlElement", __FILE__, __LINE__); //nsTraceRefcnt::Create((nsIFormControl*)this, "nsHTMLFormControlElement", __FILE__, __LINE__);
mHandlingClick = PR_FALSE;
} }
nsHTMLInputElement::~nsHTMLInputElement() nsHTMLInputElement::~nsHTMLInputElement()
@ -740,6 +743,9 @@ nsHTMLInputElement::Click()
{ {
nsresult rv = NS_OK; nsresult rv = NS_OK;
if (mHandlingClick) // Fixes crash as in bug 41599 --heikki@netscape.com
return rv;
// first see if we are disabled or not. If disabled then do nothing. // first see if we are disabled or not. If disabled then do nothing.
nsAutoString disabled; nsAutoString disabled;
if (NS_CONTENT_ATTR_HAS_VALUE == mInner.GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::disabled, disabled)) { if (NS_CONTENT_ATTR_HAS_VALUE == mInner.GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::disabled, disabled)) {
@ -775,12 +781,18 @@ nsHTMLInputElement::Click()
event.isMeta = PR_FALSE; event.isMeta = PR_FALSE;
event.clickCount = 0; event.clickCount = 0;
event.widget = nsnull; event.widget = nsnull;
mHandlingClick = PR_TRUE;
rv = HandleDOMEvent(context, &event, nsnull, NS_EVENT_FLAG_INIT, &status); rv = HandleDOMEvent(context, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
mHandlingClick = PR_FALSE;
} }
} }
} }
} }
} }
return rv; return rv;
} }