View Details Raw Unified Return to Bug 119243
Collapse All Expand All
- a/Source/WebKit2/ChangeLog +13 lines
Lines 1-3 a/Source/WebKit2/ChangeLog_sec1
1 
2013-07-30  Tim Horton  <timothy_horton@apple.com>
2 

            

            

              3
              
        Null deref under WebPage::scaledSnapshotWithOptions

            

            

              4
              
        https://bugs.webkit.org/show_bug.cgi?id=119243

            

            

              5
              
        <rdar://problem/14502050>

            

            

              6
              

            

            

              7
              
        Reviewed by NOBODY (OOPS!).

            

            

              8
              

            

            

              9
              
        * WebProcess/WebPage/WebPage.cpp:

            

            

              10
              
        (WebKit::WebPage::scaledSnapshotWithOptions):

            

            

              11
              
        WebFrame::coreFrame() can be null (if the Frame is already torn down),

            

            

              12
              
        so we should check it.

            

            

              13
              

            

        

          1
          
2013-07-29  Tim Horton  <timothy_horton@apple.com>

          14
          
2013-07-29  Tim Horton  <timothy_horton@apple.com>

        

        

          2
          

          15
          

        

        

          3
          
        Null deref under PluginView::handlesPageScaleFactor()

          16
          
        Null deref under PluginView::handlesPageScaleFactor()

        



-
  a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
    
      -1 / +5 lines
    




  

    
      
            Lines 1500-1506
      
      void WebPage::showPageBanners()
      
        a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp_sec1
      
    
  

        

          1500
          

          1500
          

        

        

          1501
          
PassRefPtr<WebImage> WebPage::scaledSnapshotWithOptions(const IntRect& rect, double scaleFactor, SnapshotOptions options)

          1501
          
PassRefPtr<WebImage> WebPage::scaledSnapshotWithOptions(const IntRect& rect, double scaleFactor, SnapshotOptions options)

        

        

          1502
          
{

          1502
          
{

        

          
            

              1503
              
    FrameView* frameView = m_mainFrame->coreFrame()->view();


              1503
              
    Frame* coreFrame = m_mainFrame->coreFrame();

            

            

              
              

              1504
              
    if (!coreFrame)

            

            


              1505
              
        return 0;

            

            


              1506
              

            

            


              1507
              
    FrameView* frameView = coreFrame->view();

            

        

          1504
          
    if (!frameView)

          1508
          
    if (!frameView)

        

        

          1505
          
        return 0;

          1509
          
        return 0;

        

        

          1506
          

          1510
          

        






  

  Return to Bug 119243