Merge 129962 - REGRESSION(r122215) - CachedImage::likelyToBeUsedSoon crashes on accessing a deleted…

Source/WebCore/platform/win/ClipboardWin.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 337 matching lines @@
     : Clipboard(policy, clipboardType)
     , m_dataObject(0)
     , m_writableDataObject(0)
     , m_frame(frame)
     , m_dragDataMap(dataMap)
 {
 }
 
 ClipboardWin::~ClipboardWin()
 {
+    if (m_dragImage)
+        m_dragImage->removeClient(this);
 }
 
 static bool writeURL(WCDataObject *data, const KURL& url, String title, bool withPlainText, bool withHTML)
 {
     ASSERT(data);
 
     if (url.isEmpty())
         return false;
     
     if (title.isEmpty()) {
@@ skipping 436 matching lines @@
 
 void ClipboardWin::setExternalDataObject(IDataObject *dataObject)
 {
     ASSERT(isForDragAndDrop());
 
     m_writableDataObject = 0;
     m_dataObject = dataObject;
 }
 
 } // namespace WebCore