Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(378)

Side by Side Diff: Source/WebCore/html/parser/HTMLTreeBuilder.cpp

Issue 9072017: Merge 102089 - Heap-buffer-overflow in WebCore::HTMLTreeBuilder::processEndTag (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « LayoutTests/fast/parser/foreign-content-crash-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google, Inc. All Rights Reserved. 2 * Copyright (C) 2010 Google, Inc. All Rights Reserved.
3 * Copyright (C) 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 2295 matching lines...) Expand 10 before | Expand all | Expand 10 after
2306 m_tree.openElements()->popUntilPopped(selectTag.localName()); 2306 m_tree.openElements()->popUntilPopped(selectTag.localName());
2307 resetInsertionModeAppropriately(); 2307 resetInsertionModeAppropriately();
2308 return; 2308 return;
2309 } 2309 }
2310 break; 2310 break;
2311 case InTableTextMode: 2311 case InTableTextMode:
2312 defaultForInTableText(); 2312 defaultForInTableText();
2313 processEndTag(token); 2313 processEndTag(token);
2314 break; 2314 break;
2315 case InForeignContentMode: 2315 case InForeignContentMode:
2316 if (m_tree.currentElement()->namespaceURI() == SVGNames::svgNamespaceURI ) 2316 if (m_tree.currentNode()->namespaceURI() == SVGNames::svgNamespaceURI)
2317 adjustSVGTagNameCase(token); 2317 adjustSVGTagNameCase(token);
2318 2318
2319 if (token.name() == SVGNames::scriptTag && m_tree.currentNode()->hasTagN ame(SVGNames::scriptTag)) { 2319 if (token.name() == SVGNames::scriptTag && m_tree.currentNode()->hasTagN ame(SVGNames::scriptTag)) {
2320 m_isPaused = true; 2320 m_isPaused = true;
2321 m_scriptToProcess = m_tree.currentElement(); 2321 m_scriptToProcess = m_tree.currentElement();
2322 m_tree.openElements()->pop(); 2322 m_tree.openElements()->pop();
2323 return; 2323 return;
2324 } 2324 }
2325 if (!isInHTMLNamespace(m_tree.currentNode())) { 2325 if (!isInHTMLNamespace(m_tree.currentNode())) {
2326 // FIXME: This code just wants an Element* iterator, instead of an E lementRecord* 2326 // FIXME: This code just wants an Element* iterator, instead of an E lementRecord*
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
2841 } 2841 }
2842 2842
2843 bool HTMLTreeBuilder::pluginsEnabled(Frame* frame) 2843 bool HTMLTreeBuilder::pluginsEnabled(Frame* frame)
2844 { 2844 {
2845 if (!frame) 2845 if (!frame)
2846 return false; 2846 return false;
2847 return frame->loader()->subframeLoader()->allowPlugins(NotAboutToInstantiate Plugin); 2847 return frame->loader()->subframeLoader()->allowPlugins(NotAboutToInstantiate Plugin);
2848 } 2848 }
2849 2849
2850 } 2850 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/parser/foreign-content-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698