Attachment #17001 for bug #15805

View Details Raw Unified Return to Bug 15805



2007-11-02  Darin Adler  <darin@apple.com>

        Reviewed by NOBODY (OOPS!).

        - speculative fix for http://bugs.webkit.org/show_bug.cgi?id=15805
          <rdar://problem/5510779> crashes in isLoadingMultipartContent

        * loader/DocumentLoader.cpp: (WebCore::DocumentLoader::isLoadingMultipartContent):
        Instead of asserting the frame loader is non-0, return false if it is 0.

2007-11-01  Oliver Hunt  <oliver@apple.com>

        Reviewed by Alexey.




bool DocumentLoader::isLoadingMultipartContent() const
{
    return m_mainResourceLoader && m_mainResourceLoader->isLoadingMultipartContent();
    return m_mainResourceLoader->isLoadingMultipartContent();
}

bool DocumentLoader::startLoadingMainResource(unsigned long identifier)

Return to Bug 15805

Lines 672-679 bool DocumentLoader::isLoadingPlugIns() WebCore/loader/DocumentLoader.cpp_sec1
- WebCore/loader/DocumentLoader.cpp -2 / +1 lines
672		672
673	bool DocumentLoader::isLoadingMultipartContent() const	673	bool DocumentLoader::isLoadingMultipartContent() const
674	{	674	{
675	ASSERT(m_mainResourceLoader);	675	return m_mainResourceLoader && m_mainResourceLoader->isLoadingMultipartContent();
676	return m_mainResourceLoader->isLoadingMultipartContent();
677	}	676	}
678		677
679	bool DocumentLoader::startLoadingMainResource(unsigned long identifier)	678	bool DocumentLoader::startLoadingMainResource(unsigned long identifier)

Lines 1-3 WebCore/ChangeLog_sec1
- WebCore/ChangeLog +10 lines
		1	2007-11-02 Darin Adler <darin@apple.com>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	- speculative fix for http://bugs.webkit.org/show_bug.cgi?id=15805
		6	<rdar://problem/5510779> crashes in isLoadingMultipartContent
		7
		8	* loader/DocumentLoader.cpp: (WebCore::DocumentLoader::isLoadingMultipartContent):
		9	Instead of asserting the frame loader is non-0, return false if it is 0.
		10
1	2007-11-01 Oliver Hunt <oliver@apple.com>	11	2007-11-01 Oliver Hunt <oliver@apple.com>
2		12
3	Reviewed by Alexey.	13	Reviewed by Alexey.