64766 2011-07-18 16:49:54 -0700 Crash under WebPage::platformDragEnded when dragging on Mac 2011-07-19 10:21:23 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Mac OS X 10.6 RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 1 bweinstein bweinstein darin enrica webkit.review.bot oldest_to_newest 438822 0 bweinstein 2011-07-18 16:49:54 -0700 <rdar://problem/9548174> There is a crash under WebPage::platformDragEnded when dragging on Mac: * BACKTRACE ('>' indicates stack frame used for CrashTracer aggregation) 1 libobjc.A.dylib 0x7fff9592de10 objc_msgSend_vtable5 + 0x10 > 2 com.apple.AppKit 0x7fff8ed9105c -[NSFilePromiseDragSource draggedImage:endedAt:operation:] + 0x65 3 com.apple.WebKit2 0x7fff8f51e6c5 WebKit::WebPage::platformDragEnded() + 0x47 4 com.apple.WebKit2 0x7fff8f517e32 WebKit::WebPage::dragEnded(WebCore::IntPoint, WebCore::IntPoint, unsigned long long) + 0x38 5 com.apple.WebKit2 0x7fff8f548c9b void CoreIPC::handleMessage<Messages::WebPage::DragEnded, WebKit::WebPage, void (WebKit::WebPage::*)(WebCore::IntPoint, WebCore::IntPoint, unsigned long long)>(CoreIPC::ArgumentDecoder*, WebKit::WebPage*, void (WebKit::WebPage::*)(WebCore::IntPoint, WebCore::IntPoint, unsigned long long)) + 0x3d 6 com.apple.WebKit2 0x7fff8f4ba540 CoreIPC::Connection::dispatchMessage(CoreIPC::Connection::Message<CoreIPC::ArgumentDecoder>&) + 0xac 7 com.apple.WebKit2 0x7fff8f4ba47b CoreIPC::Connection::dispatchMessages() + 0x67 8 com.apple.WebKit2 0x7fff8f4b7b3d RunLoop::performWork() + 0x6f 9 com.apple.WebKit2 0x7fff8f4b7aae RunLoop::performWork(void*) + 0x4c 10 com.apple.CoreFoundation 0x7fff8a2cc591 __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE0_PERFORM_FUNCTION__ + 0x11 11 com.apple.CoreFoundation 0x7fff8a2cbdfd __CFRunLoopDoSources0 + 0xfd 12 com.apple.CoreFoundation 0x7fff8a2f2aa9 __CFRunLoopRun + 0x389 13 com.apple.CoreFoundation 0x7fff8a2f23e6 CFRunLoopRunSpecific + 0xe6 14 com.apple.HIToolbox 0x7fff9276aa1b RunCurrentEventLoopInMode + 0x115 15 com.apple.HIToolbox 0x7fff9277213d ReceiveNextEventCommon + 0x163 16 com.apple.HIToolbox 0x7fff92771fca BlockUntilNextEventMatchingListInMode + 0x3e 17 com.apple.AppKit 0x7fff8e6cb6a9 _DPSNextEvent + 0x293 18 com.apple.AppKit 0x7fff8e6cafb0 -[NSApplication nextEventMatchingMask:untilDate:inMode:dequeue:] + 0x87 19 com.apple.AppKit 0x7fff8e6c795b -[NSApplication run] + 0x1c8 20 com.apple.WebKit2 0x7fff8f530e57 WebKit::WebProcessMain(WebKit::CommandLine const&) + 0x24b 21 com.apple.WebKit2 0x7fff8f5162b0 WebKitMain + 0x10c 22 com.apple.WebProcess 0x106f0cda4 start + 0x0 438828 1 101236 bweinstein 2011-07-18 16:52:00 -0700 Created attachment 101236 [PATCH] Prep Work 438830 2 101236 bweinstein 2011-07-18 16:52:33 -0700 Comment on attachment 101236 [PATCH] Prep Work View in context: https://bugs.webkit.org/attachment.cgi?id=101236&action=review > Source/WebCore/page/DragClient.h:73 > + virtual void declareAndWriteDragImage(NSPasteboard *, DOMElement*, NSURL *, NSString*, Frame *) {} Oops, I meant to make this NSString *, Frame*. Fixed locally. 438837 3 101236 darin 2011-07-18 16:55:38 -0700 Comment on attachment 101236 [PATCH] Prep Work View in context: https://bugs.webkit.org/attachment.cgi?id=101236&action=review > Source/WebCore/page/DragClient.h:70 > + // Mac specific helper functions to allow access to functionality in webkit -- such as I’d put a hyphen in Mac-specific. And I’d capitalize WebKit. And I’d try to make it grammatical: ... functionality in WebKit, for use in places such as web archives and NSPasteboard extras. Maybe rewrite it entirely for clarity. > Source/WebCore/page/DragClient.h:78 > + virtual void declareAndWriteDragImage(NSPasteboard *, DOMElement*, NSURL *, NSString*, Frame *) {} > #endif > > - virtual ~DragClient() {}; > + virtual void dragEnded() {} > + > + virtual ~DragClient() {} Our style is to put a space between the braces "{ }". 438838 4 webkit.review.bot 2011-07-18 16:55:44 -0700 Attachment 101236 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/page/DragClient.h:73: Missing space inside { }. [whitespace/braces] [5] Source/WebCore/page/DragClient.h:76: Missing space inside { }. [whitespace/braces] [5] Source/WebCore/page/DragClient.h:78: Missing space inside { }. [whitespace/braces] [5] Total errors found: 3 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 438843 5 bweinstein 2011-07-18 16:59:08 -0700 (In reply to comment #3) > (From update of attachment 101236 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=101236&action=review > > > Source/WebCore/page/DragClient.h:70 > > + // Mac specific helper functions to allow access to functionality in webkit -- such as > > I’d put a hyphen in Mac-specific. And I’d capitalize WebKit. And I’d try to make it grammatical: > > ... functionality in WebKit, for use in places such as > web archives and NSPasteboard extras. > > Maybe rewrite it entirely for clarity. Rewritten: // Mac-specific helper function to allow access to web archives and NSPasteboard extras in WebKit. > > > Source/WebCore/page/DragClient.h:78 > > + virtual void declareAndWriteDragImage(NSPasteboard *, DOMElement*, NSURL *, NSString*, Frame *) {} > > #endif > > > > - virtual ~DragClient() {}; > > + virtual void dragEnded() {} > > + > > + virtual ~DragClient() {} > > Our style is to put a space between the braces "{ }". Fixed, style bot caught that one too! 438849 6 bweinstein 2011-07-18 17:15:30 -0700 Prep patch landed in r91222. 438931 7 101260 bweinstein 2011-07-18 19:38:31 -0700 Created attachment 101260 [PATCH] Speculative Fix 438932 8 101260 webkit-ews 2011-07-18 19:46:59 -0700 Comment on attachment 101260 [PATCH] Speculative Fix Attachment 101260 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/9139009 439220 9 bweinstein 2011-07-19 09:57:15 -0700 Fixed Windows and Qt build by removing stub implementation of WebPage::platformDragEnd locally. 439227 10 101260 enrica 2011-07-19 10:11:44 -0700 Comment on attachment 101260 [PATCH] Speculative Fix The approach looks very reasonable to me. 439228 11 bweinstein 2011-07-19 10:17:15 -0700 Landed in r91266. 439229 12 101260 darin 2011-07-19 10:18:42 -0700 Comment on attachment 101260 [PATCH] Speculative Fix View in context: https://bugs.webkit.org/attachment.cgi?id=101260&action=review > Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:178 > + // The drag source we care about here is NSFilePromiseDragSource, which doesn't look at > + // the arguments. It's OK to just pass arbitrary constant values, so we just pass all zeroes. > + [m_filePromiseOwner.get() draggedImage:nil endedAt:NSZeroPoint operation:NSDragOperationNone]; You need to retain m_filePromiseOwner an extra time here because draggedImage releases it. Without that retain, this code does an overrelease. > Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm:-690 > - // The draggedImage method releases its responder; we retain here to balance that. > - [m_dragSource.get() retain]; This code is needed! You removed it! 439230 13 darin 2011-07-19 10:20:51 -0700 This patch reintroduces bug 57654 by removing the fix for that bug. Please add it back. See <http://trac.webkit.org/changeset/82853> for the original fix. 439231 14 darin 2011-07-19 10:21:23 -0700 (In reply to comment #13) > This patch reintroduces bug 57654 by removing the fix for that bug. Please add it back. See <http://trac.webkit.org/changeset/82853> for the original fix. By removing half of the fix for that bug, I mean. 101236 2011-07-18 16:52:00 -0700 2011-07-18 17:15:44 -0700 [PATCH] Prep Work prep_drag_crash.patch text/plain 3519 bweinstein SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxMjE4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDctMTggIEJyaWFuIFdl aW5zdGVpbiAgPGJ3ZWluc3RlaW5AYXBwbGUuY29tPgorCisgICAgICAgIFByZXAgd29yayBmb3I6 IENyYXNoIHVuZGVyIFdlYlBhZ2U6OnBsYXRmb3JtRHJhZ0VuZGVkIHdoZW4gZHJhZ2dpbmcgb24g TWFjCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDc2 NgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vOTU0ODE3ND4KKworICAgICAgICBBZGQgYSBEcmFn Q2xpZW50IGZ1bmN0aW9uIHRoYXQgaXMgY2FsbGVkIHdoZW4gYSBkcmFnIGlzIGVuZGVkLCBhbmQg Y2FsbCBpdCBmcm9tIERyYWdDb250cm9sbGVyOjpkcmFnRW5kZWQuCisgICAgICAgIFRoaXMgaXNu J3QgdXNlZCB5ZXQsIGJ1dCB3aWxsIGJlIHVzZWQgYnkgV2ViS2l0MiBvbiBNYWMuCisgICAgICAg IAorICAgICAgICBUaGlzIHBhdGNoIGFsc28gY2xlYW5zIHVwIHN0eWxlIGluIERyYWdDbGllbnQu aC4KKworICAgICAgICBObyBjaGFuZ2UgaW4gYmVoYXZpb3IsIG5vIHRlc3RzIG5lZWRlZC4KKwor ICAgICAgICAqIHBhZ2UvRHJhZ0NsaWVudC5oOgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0NsaWVu dDo6ZHJhZ0VuZGVkKTogU3R1YiB2aXJ0dWFsIGltcGxlbWVudGF0aW9uIGZvciBub3csIHRoaXMg d2lsbCBiZSB1c2VkIGJ5CisgICAgICAgICAgICBXZWJLaXQyIG9uIE1hYy4KKyAgICAgICAgKiBw YWdlL0RyYWdDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRyYWdDb250cm9sbGVy OjpkcmFnRW5kZWQpOiBDYWxsIERyYWdDbGllbnQ6OmRyYWdFbmRlZC4KKwogMjAxMS0wNy0xOCAg RGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFNwZWNpZnkgYSBjYXNj YWRlIGxpc3QgY29uc2lzdGluZyBvZiB0aGUgbGFzdCByZXNvcnQgZm9udCBmb3IgQ29yZSBUZXh0 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDbGllbnQuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDbGllbnQuaAkocmV2aXNpb24gOTExOTQpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wYWdlL0RyYWdDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNTgsMjAgKzU4 LDI0IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdmlydHVhbCB2b2lkIHdpbGxQZXJm b3JtRHJhZ0Rlc3RpbmF0aW9uQWN0aW9uKERyYWdEZXN0aW5hdGlvbkFjdGlvbiwgRHJhZ0RhdGEq KSA9IDA7CiAgICAgICAgIHZpcnR1YWwgdm9pZCB3aWxsUGVyZm9ybURyYWdTb3VyY2VBY3Rpb24o RHJhZ1NvdXJjZUFjdGlvbiwgY29uc3QgSW50UG9pbnQmLCBDbGlwYm9hcmQqKSA9IDA7CiAgICAg ICAgIHZpcnR1YWwgRHJhZ0Rlc3RpbmF0aW9uQWN0aW9uIGFjdGlvbk1hc2tGb3JEcmFnKERyYWdE YXRhKikgPSAwOwotICAgICAgICAvL1dlIHdvcmsgaW4gd2luZG93IHJhdGhlciB0aGFuIHZpZXcg Y29vcmRpbmF0ZXMgaGVyZQorCisgICAgICAgIC8vIFdlIHdvcmsgaW4gd2luZG93IHJhdGhlciB0 aGFuIHZpZXcgY29vcmRpbmF0ZXMgaGVyZS4KICAgICAgICAgdmlydHVhbCBEcmFnU291cmNlQWN0 aW9uIGRyYWdTb3VyY2VBY3Rpb25NYXNrRm9yUG9pbnQoY29uc3QgSW50UG9pbnQmIHdpbmRvd1Bv aW50KSA9IDA7CiAgICAgICAgIAogICAgICAgICB2aXJ0dWFsIHZvaWQgc3RhcnREcmFnKERyYWdJ bWFnZVJlZiBkcmFnSW1hZ2UsIGNvbnN0IEludFBvaW50JiBkcmFnSW1hZ2VPcmlnaW4sIGNvbnN0 IEludFBvaW50JiBldmVudFBvcywgQ2xpcGJvYXJkKiwgRnJhbWUqLCBib29sIGxpbmtEcmFnID0g ZmFsc2UpID0gMDsKICAgICAgICAgCiAgICAgICAgIHZpcnR1YWwgdm9pZCBkcmFnQ29udHJvbGxl ckRlc3Ryb3llZCgpID0gMDsKKwogI2lmIFBMQVRGT1JNKE1BQykKLSAgICAgICAgLy9NYWMgc3Bl Y2lmaWMgaGVscGVyIGZ1bmN0aW9ucyB0byBhbGxvdyBhY2Nlc3MgdG8gZnVuY3Rpb25hbGl0eSBp biB3ZWJraXQgLS0gc3VjaCBhcyAKLSAgICAgICAgLy93ZWIgYXJjaGl2ZXMgYW5kIE5TUGFzdGVi b2FyZCBleHRyYXMgCi0gICAgICAgIC8vbm90IGFic3RyYWN0IGFzIHRoYXQgd291bGQgcmVxdWly ZSBhbm90aGVyICNpZiBQTEFURk9STShNQUMpIGZvciB0aGUgU1ZHSW1hZ2UgY2xpZW50IGVtcHR5 IGltcGwKLSAgICAgICAgdmlydHVhbCB2b2lkIGRlY2xhcmVBbmRXcml0ZURyYWdJbWFnZShOU1Bh c3RlYm9hcmQqLCBET01FbGVtZW50KiwgTlNVUkwqLCBOU1N0cmluZyosIEZyYW1lKikge307Cisg ICAgICAgIC8vIE1hYyBzcGVjaWZpYyBoZWxwZXIgZnVuY3Rpb25zIHRvIGFsbG93IGFjY2VzcyB0 byBmdW5jdGlvbmFsaXR5IGluIHdlYmtpdCAtLSBzdWNoIGFzIAorICAgICAgICAvLyB3ZWIgYXJj aGl2ZXMgYW5kIE5TUGFzdGVib2FyZCBleHRyYXMuCisgICAgICAgIC8vIFRoaXMgaXMgbm90IGFi c3RyYWN0IGFzIHRoYXQgd291bGQgcmVxdWlyZSBhbm90aGVyICNpZiBQTEFURk9STShNQUMpIGZv ciB0aGUgU1ZHSW1hZ2UgY2xpZW50IGVtcHR5IGltcGxlbnRhdGlvbi4KKyAgICAgICAgdmlydHVh bCB2b2lkIGRlY2xhcmVBbmRXcml0ZURyYWdJbWFnZShOU1Bhc3RlYm9hcmQgKiwgRE9NRWxlbWVu dCosIE5TVVJMICosIE5TU3RyaW5nKiwgRnJhbWUgKikge30KICNlbmRpZgogICAgICAgICAKLSAg ICAgICAgdmlydHVhbCB+RHJhZ0NsaWVudCgpIHt9OworICAgICAgICB2aXJ0dWFsIHZvaWQgZHJh Z0VuZGVkKCkge30KKworICAgICAgICB2aXJ0dWFsIH5EcmFnQ2xpZW50KCkge30KICAgICB9Owog ICAgIAogfQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAJKHJldmlz aW9uIDkxMTk0KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTE1OCw2ICsxNTgsOCBAQCB2b2lkIERyYWdDb250cm9sbGVyOjpkcmFn RW5kZWQoKQogICAgIG1fZHJhZ0luaXRpYXRvciA9IDA7CiAgICAgbV9kaWRJbml0aWF0ZURyYWcg PSBmYWxzZTsKICAgICBtX3BhZ2UtPmRyYWdDYXJldENvbnRyb2xsZXIoKS0+Y2xlYXIoKTsKKyAg ICAKKyAgICBtX2NsaWVudC0+ZHJhZ0VuZGVkKCk7CiB9CiAKIERyYWdPcGVyYXRpb24gRHJhZ0Nv bnRyb2xsZXI6OmRyYWdFbnRlcmVkKERyYWdEYXRhKiBkcmFnRGF0YSkK 101260 2011-07-18 19:38:31 -0700 2011-07-19 10:18:42 -0700 [PATCH] Speculative Fix specuatlve_drag_drop_crash_fix.patch text/plain 9126 bweinstein SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxMjMxKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTEtMDctMTggIEJyaWFuIFdl aW5zdGVpbiAgPGJ3ZWluc3RlaW5AYXBwbGUuY29tPgorCisgICAgICAgIFNwZWN1bGF0aXZlIGZp eCBmb3I6IENyYXNoIHVuZGVyIFdlYlBhZ2U6OnBsYXRmb3JtRHJhZ0VuZGVkIHdoZW4gZHJhZ2dp bmcgb24gTWFjCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02NDc2NgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vOTU0ODE3ND4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJIHdhcyB1bmFibGUgdG8gcmVwcm9k dWNlIHRoaXMgYnVnLCBidXQgRGFyaW4gQWRsZXIgYW5kIEkgZGlzY3Vzc2VkIHRoZSBwcm9iYWJs ZSBpc3N1ZS4gV2hlbiBzdGFydGluZyB0aGUgZHJhZywgd2UgY3JlYXRlIAorICAgICAgICBhIFdL UGFzdGVib2FyZEZpbGVQcm9taXNlT3duZXIsIGFuZCBhIFdLUGFzdGVib2FyZE93bmVyLiBXaGVu IHRoZSBkcmFnIGlzIGNvbmNsdWRlZCwgd2UgY2FsbCBhIG1ldGhvZCBvbiB0aGUgV0tQYXN0ZWJv YXJkRmlsZVByb21pc2VPd25lcgorICAgICAgICB3aGljaCB1c2VzIHRoZSBXS1Bhc3RlYm9hcmRP d25lci4gSG93ZXZlciwgd2UgYXJlIG5vdCBndWFyYW50ZWVpbmcgdGhhdCB0aGUgV0tQYXN0ZWJv YXJkT3duZXIgd2lsbCBiZSBhcm91bmQgd2hlbiB0aGUgCisgICAgICAgIFdLUGFzdGVib2FyZEZp bGVQcm9taXNlT3duZXIgbWV0aG9kIGlzIGNhbGxlZC4KKyAgICAgICAgCisgICAgICAgIFRoZSBm aXggaXMgdG8gcmV0YWluIGJvdGggdGhlIFdLUGFzdGVib2FyZEZpbGVQcm9taXNlT3duZXIgYW5k IHRoZSBXS1Bhc3RlYm9hcmRPd25lciB0aGF0IHdlIG5lZWQsIG1ha2luZyBzdXJlIHRoYXQgd2Ug YXJlIGtlZXBpbmcKKyAgICAgICAgYm90aCBvYmplY3RzIGFsaXZlLgorICAgICAgICAKKyAgICAg ICAgVGhpcyBwYXRjaCBhbHNvIHVzZXMgcjkxMjIyIHRvIHJlcGxhY2UgV2ViUGFnZTo6cGxhdGZv cm1EcmFnRW5kZWQsIHNvIFdlYlBhZ2UgZG9lc24ndCBuZWVkIHRvIGtub3cgYWJvdXQgdGhlIGRy YWcgc291cmNlLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJEcmFn Q2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRHJhZ0NsaWVudDo6ZHJhZ0VuZGVkKTog QWRkIGEgbm9uLU1hYyBzdHViIG1ldGhvZCwgc2luY2UgdGhlIE1hYyBpcyB0aGUgb25seSBwbGF0 Zm9ybSB0aGF0IGRvZXMgc29tZXRoaW5nIGhlcmUuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9XZWJEcmFnQ2xpZW50Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9tYWMvV2ViRHJhZ0NsaWVudE1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViRHJh Z0NsaWVudDo6ZGVjbGFyZUFuZFdyaXRlRHJhZ0ltYWdlKTogVXNlIG1lbWJlciB2YXJpYWJsZXMg aW5zdGVhZCBvZiBsb2NhbCB2YXJpYWJsZXMuCisgICAgICAgIChXZWJLaXQ6OldlYkRyYWdDbGll bnQ6OmRyYWdFbmRlZCk6IE1vdmUgY29kZSBmcm9tIFdlYlBhZ2VNYWM6OnBsYXRmb3JtRHJhZ0Vu ZGVkIHRvIGhlcmUsIGFuZCBjbGVhciBib3RoIG1lbWJlciB2YXJpYWJsZXMuCisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl OjpkcmFnRW5kZWQpOiBEb24ndCBjYWxsIHBsYXRmb3JtRHJhZ0VuZGVkIGFueW1vcmUuIFdlYkNv cmU6OkRyYWdDb250cm9sbGVyOjpkcmFnRW5kZWQgY2FsbHMgV2ViRHJhZ0NsaWVudDo6ZHJhZ0Vu ZGVkLAorICAgICAgICAgICAgd2hpY2ggZG9lcyB0aGUgc2FtZSB0aGluZy4KKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn ZS9tYWMvV2ViUGFnZU1hYy5tbTogUmVtb3ZlIHBsYXRmb3JtRHJhZ0VuZGVkLgorCiAyMDExLTA3 LTE4ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVGlt ZXIgc2NoZWR1bGluZyBzaG91bGQgYmUgYmFzZWQgb2ZmIHRoZSBtb25vdG9uaWMgY2xvY2sKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRHJhZ0NsaWVu dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJEcmFnQ2xpZW50LmNwcAkocmV2aXNpb24gOTExOTQpCisrKyBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkRyYWdDbGllbnQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC01OCw2ICs1OCwxMiBAQCB2b2lkIFdlYkRyYWdDbGllbnQ6OnN0YXJ0RHJhZyhEcmFn SW1hZ2VSCiB9CiAjZW5kaWYKIAorI2lmICFQTEFURk9STShNQUMpCit2b2lkIFdlYkRyYWdDbGll bnQ6OmRyYWdFbmRlZCgpCit7Cit9CisjZW5kaWYKKwogdm9pZCBXZWJEcmFnQ2xpZW50OjpkcmFn Q29udHJvbGxlckRlc3Ryb3llZCgpCiB7CiAgICAgZGVsZXRlIHRoaXM7CkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkRyYWdDbGllbnQuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkRyYWdD bGllbnQuaAkocmV2aXNpb24gOTExOTQpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L1dlYkRyYWdDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMjgsNiArMjgs MTYgQEAKIAogI2luY2x1ZGUgPFdlYkNvcmUvRHJhZ0NsaWVudC5oPgogCisjaWYgUExBVEZPUk0o TUFDKQorI2lmZGVmIF9fT0JKQ19fCitAY2xhc3MgV0tQYXN0ZWJvYXJkRmlsZVByb21pc2VPd25l cjsKK0BjbGFzcyBXS1Bhc3RlYm9hcmRPd25lcjsKKyNlbHNlCitjbGFzcyBXS1Bhc3RlYm9hcmRG aWxlUHJvbWlzZU93bmVyOworY2xhc3MgV0tQYXN0ZWJvYXJkT3duZXI7CisjZW5kaWYKKyNlbmRp ZgorCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgV2ViUGFnZTsKQEAgLTUwLDkgKzYwLDE3 IEBAIHByaXZhdGU6CiAjaWYgUExBVEZPUk0oTUFDKQogICAgIHZpcnR1YWwgdm9pZCBkZWNsYXJl QW5kV3JpdGVEcmFnSW1hZ2UoTlNQYXN0ZWJvYXJkKiwgRE9NRWxlbWVudCosIE5TVVJMKiwgTlNT dHJpbmcqLCBXZWJDb3JlOjpGcmFtZSopOwogI2VuZGlmCisKKyAgICB2aXJ0dWFsIHZvaWQgZHJh Z0VuZGVkKCk7CisKICAgICB2aXJ0dWFsIHZvaWQgZHJhZ0NvbnRyb2xsZXJEZXN0cm95ZWQoKTsK IAogICAgIFdlYlBhZ2UqIG1fcGFnZTsKKyAgICAKKyNpZiBQTEFURk9STShNQUMpCisgICAgUmV0 YWluUHRyPFdLUGFzdGVib2FyZEZpbGVQcm9taXNlT3duZXI+IG1fZmlsZVByb21pc2VPd25lcjsK KyAgICBSZXRhaW5QdHI8V0tQYXN0ZWJvYXJkT3duZXI+IG1fcGFzdGVib2FyZE93bmVyOworI2Vu ZGlmCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYkRyYWdDbGllbnRNYWMubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViRHJh Z0NsaWVudE1hYy5tbQkocmV2aXNpb24gOTExOTQpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJEcmFnQ2xpZW50TWFjLm1tCSh3b3JraW5nIGNvcHkp CkBAIC0xNDgsMTYgKzE0OCwxNCBAQCB2b2lkIFdlYkRyYWdDbGllbnQ6OmRlY2xhcmVBbmRXcml0 ZURyYWdJCiAgICAgUmV0YWluUHRyPE5TTXV0YWJsZUFycmF5PiB0eXBlcyhBZG9wdE5TLCBbW05T TXV0YWJsZUFycmF5IGFsbG9jXSBpbml0V2l0aE9iamVjdHM6TlNGaWxlc1Byb21pc2VQYm9hcmRU eXBlLCBuaWxdKTsKICAgICBbdHlwZXMuZ2V0KCkgYWRkT2JqZWN0c0Zyb21BcnJheTphcmNoaXZl ID8gUGFzdGVib2FyZFR5cGVzOjpmb3JJbWFnZXNXaXRoQXJjaGl2ZSgpIDogUGFzdGVib2FyZFR5 cGVzOjpmb3JJbWFnZXMoKV07CiAKLSAgICBSZXRhaW5QdHI8V0tQYXN0ZWJvYXJkT3duZXI+IHBh c3RlYm9hcmRPd25lcihBZG9wdE5TLCBbW1dLUGFzdGVib2FyZE93bmVyIGFsbG9jXSBpbml0V2l0 aEltYWdlOmltYWdlXSk7CisgICAgbV9wYXN0ZWJvYXJkT3duZXIuYWRvcHROUyhbW1dLUGFzdGVi b2FyZE93bmVyIGFsbG9jXSBpbml0V2l0aEltYWdlOmltYWdlXSk7CisgICAgbV9maWxlUHJvbWlz ZU93bmVyLmFkb3B0TlMoWyhXS1Bhc3RlYm9hcmRGaWxlUHJvbWlzZU93bmVyICopW1dLUGFzdGVi b2FyZEZpbGVQcm9taXNlT3duZXIgYWxsb2NdIGluaXRXaXRoU291cmNlOm1fcGFzdGVib2FyZE93 bmVyLmdldCgpXSk7CiAKLSAgICBSZXRhaW5QdHI8V0tQYXN0ZWJvYXJkRmlsZVByb21pc2VPd25l cj4gZmlsZVByb21pc2VPd25lcihBZG9wdE5TLCBbKFdLUGFzdGVib2FyZEZpbGVQcm9taXNlT3du ZXIgKilbV0tQYXN0ZWJvYXJkRmlsZVByb21pc2VPd25lciBhbGxvY10gaW5pdFdpdGhTb3VyY2U6 cGFzdGVib2FyZE93bmVyLmdldCgpXSk7Ci0gICAgbV9wYWdlLT5zZXREcmFnU291cmNlKGZpbGVQ cm9taXNlT3duZXIuZ2V0KCkpOwotCi0gICAgW3Bhc3RlYm9hcmQgZGVjbGFyZVR5cGVzOnR5cGVz LmdldCgpIG93bmVyOnBhc3RlYm9hcmRPd25lci5sZWFrUmVmKCldOyAgICAKKyAgICBbcGFzdGVi b2FyZCBkZWNsYXJlVHlwZXM6dHlwZXMuZ2V0KCkgb3duZXI6bV9wYXN0ZWJvYXJkT3duZXIubGVh a1JlZigpXTsgICAgCiAKICAgICBbcGFzdGVib2FyZCBzZXRQcm9wZXJ0eUxpc3Q6W05TQXJyYXkg YXJyYXlXaXRoT2JqZWN0OmV4dGVuc2lvbl0gZm9yVHlwZTpOU0ZpbGVzUHJvbWlzZVBib2FyZFR5 cGVdOwogCi0gICAgW2ZpbGVQcm9taXNlT3duZXIuZ2V0KCkgc2V0VHlwZXM6W3Bhc3RlYm9hcmQg cHJvcGVydHlMaXN0Rm9yVHlwZTpOU0ZpbGVzUHJvbWlzZVBib2FyZFR5cGVdIG9uUGFzdGVib2Fy ZDpwYXN0ZWJvYXJkXTsKKyAgICBbbV9maWxlUHJvbWlzZU93bmVyLmdldCgpIHNldFR5cGVzOltw YXN0ZWJvYXJkIHByb3BlcnR5TGlzdEZvclR5cGU6TlNGaWxlc1Byb21pc2VQYm9hcmRUeXBlXSBv blBhc3RlYm9hcmQ6cGFzdGVib2FyZF07CiAKICAgICBbVVJMIHdyaXRlVG9QYXN0ZWJvYXJkOnBh c3RlYm9hcmRdOwogCkBAIC0xNzMsNiArMTcxLDE2IEBAIHZvaWQgV2ViRHJhZ0NsaWVudDo6ZGVj bGFyZUFuZFdyaXRlRHJhZ0kKICAgICAgICAgW3Bhc3RlYm9hcmQgc2V0RGF0YTooTlNEYXRhICop YXJjaGl2ZS0+cmF3RGF0YVJlcHJlc2VudGF0aW9uKCkuZ2V0KCkgZm9yVHlwZTpQYXN0ZWJvYXJk VHlwZXM6OldlYkFyY2hpdmVQYm9hcmRUeXBlXTsKIH0KIAordm9pZCBXZWJEcmFnQ2xpZW50Ojpk cmFnRW5kZWQoKQoreworICAgIC8vIFRoZSBkcmFnIHNvdXJjZSB3ZSBjYXJlIGFib3V0IGhlcmUg aXMgTlNGaWxlUHJvbWlzZURyYWdTb3VyY2UsIHdoaWNoIGRvZXNuJ3QgbG9vayBhdAorICAgIC8v IHRoZSBhcmd1bWVudHMuIEl0J3MgT0sgdG8ganVzdCBwYXNzIGFyYml0cmFyeSBjb25zdGFudCB2 YWx1ZXMsIHNvIHdlIGp1c3QgcGFzcyBhbGwgemVyb2VzLgorICAgIFttX2ZpbGVQcm9taXNlT3du ZXIuZ2V0KCkgZHJhZ2dlZEltYWdlOm5pbCBlbmRlZEF0Ok5TWmVyb1BvaW50IG9wZXJhdGlvbjpO U0RyYWdPcGVyYXRpb25Ob25lXTsKKyAgICAKKyAgICBtX3Bhc3RlYm9hcmRPd25lciA9IG51bGxw dHI7CisgICAgbV9maWxlUHJvbWlzZU93bmVyID0gbnVsbHB0cjsKK30KKwogfSAvLyBuYW1lc3Bh Y2UgV2ViS2l0CiAKIEBpbXBsZW1lbnRhdGlvbiBXS1Bhc3RlYm9hcmRGaWxlUHJvbWlzZU93bmVy CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CShyZXZpc2lvbiA5MTE5NCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTc5NCw4ICsxNzk0LDcgQEAgdm9pZCBXZWJQ YWdlOjpkcmFnRW5kZWQoV2ViQ29yZTo6SW50UG9pbgogewogICAgIEludFBvaW50IGFkanVzdGVk Q2xpZW50UG9zaXRpb24oY2xpZW50UG9zaXRpb24ueCgpICsgbV9wYWdlLT5kcmFnQ29udHJvbGxl cigpLT5kcmFnT2Zmc2V0KCkueCgpLCBjbGllbnRQb3NpdGlvbi55KCkgKyBtX3BhZ2UtPmRyYWdD b250cm9sbGVyKCktPmRyYWdPZmZzZXQoKS55KCkpOwogICAgIEludFBvaW50IGFkanVzdGVkR2xv YmFsUG9zaXRpb24oZ2xvYmFsUG9zaXRpb24ueCgpICsgbV9wYWdlLT5kcmFnQ29udHJvbGxlcigp LT5kcmFnT2Zmc2V0KCkueCgpLCBnbG9iYWxQb3NpdGlvbi55KCkgKyBtX3BhZ2UtPmRyYWdDb250 cm9sbGVyKCktPmRyYWdPZmZzZXQoKS55KCkpOwotICAgIAotICAgIHBsYXRmb3JtRHJhZ0VuZGVk KCk7CisKICAgICBtX3BhZ2UtPmRyYWdDb250cm9sbGVyKCktPmRyYWdFbmRlZCgpOwogICAgIEZy YW1lVmlldyogdmlldyA9IG1fcGFnZS0+bWFpbkZyYW1lKCktPnZpZXcoKTsKICAgICBpZiAoIXZp ZXcpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJ KHJldmlzaW9uIDkxMTk0KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtNDE4LDEwICs0MTgsNiBAQCBwdWJsaWM6CiAgICAg dm9pZCB1bm1hcmtBbGxNaXNzcGVsbGluZ3MoKTsKICAgICB2b2lkIHVubWFya0FsbEJhZEdyYW1t YXIoKTsKIAotI2lmIFBMQVRGT1JNKE1BQykKLSAgICB2b2lkIHNldERyYWdTb3VyY2UoTlNPYmpl Y3QgKik7Ci0jZW5kaWYKLQogI2lmIFBMQVRGT1JNKE1BQykgJiYgIWRlZmluZWQoQlVJTERJTkdf T05fU05PV19MRU9QQVJEKQogICAgIHZvaWQgaGFuZGxlQ29ycmVjdGlvblBhbmVsUmVzdWx0KGNv bnN0IFN0cmluZyYpOwogI2VuZGlmCkBAIC01NjYsOCArNTYyLDYgQEAgcHJpdmF0ZToKICAgICB2 b2lkIGRpZFNlbGVjdEl0ZW1Gcm9tQWN0aXZlQ29udGV4dE1lbnUoY29uc3QgV2ViQ29udGV4dE1l bnVJdGVtRGF0YSYpOwogI2VuZGlmCiAKLSAgICB2b2lkIHBsYXRmb3JtRHJhZ0VuZGVkKCk7Ci0K ICAgICB2b2lkIHNldENhblN0YXJ0TWVkaWFUaW1lckZpcmVkKCk7CiAKICAgICBzdGF0aWMgYm9v bCBwbGF0Zm9ybUNhbkhhbmRsZVJlcXVlc3QoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0 Jik7CkBAIC02MTIsOCArNjA2LDYgQEAgcHJpdmF0ZToKIAogICAgIFJldGFpblB0cjxBY2Nlc3Np YmlsaXR5V2ViUGFnZU9iamVjdD4gbV9tb2NrQWNjZXNzaWJpbGl0eUVsZW1lbnQ7CiAKLSAgICBS ZXRhaW5QdHI8TlNPYmplY3Q+IG1fZHJhZ1NvdXJjZTsKLQogICAgIFdlYkNvcmU6OktleWJvYXJk RXZlbnQqIG1fa2V5Ym9hcmRFdmVudEJlaW5nSW50ZXJwcmV0ZWQ7CiAKICNlbGlmIFBMQVRGT1JN KFdJTikKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFn ZU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv bWFjL1dlYlBhZ2VNYWMubW0JKHJldmlzaW9uIDkxMTk0KQorKysgU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC02Nzks MjEgKzY3OSw2IEBAIGJvb2wgV2ViUGFnZTo6cGxhdGZvcm1DYW5IYW5kbGVSZXF1ZXN0KGMKICAg ICByZXR1cm4gcmVxdWVzdC51cmwoKS5wcm90b2NvbElzKCJhcHBsZXdlYmRhdGEiKTsKIH0KIAot dm9pZCBXZWJQYWdlOjpzZXREcmFnU291cmNlKE5TT2JqZWN0ICpkcmFnU291cmNlKQotewotICAg IG1fZHJhZ1NvdXJjZSA9IGRyYWdTb3VyY2U7Ci19Ci0KLXZvaWQgV2ViUGFnZTo6cGxhdGZvcm1E cmFnRW5kZWQoKQotewotICAgIC8vIFRoZSBkcmFnZ2VkSW1hZ2UgbWV0aG9kIHJlbGVhc2VzIGl0 cyByZXNwb25kZXI7IHdlIHJldGFpbiBoZXJlIHRvIGJhbGFuY2UgdGhhdC4KLSAgICBbbV9kcmFn U291cmNlLmdldCgpIHJldGFpbl07Ci0gICAgLy8gVGhlIGRyYWcgc291cmNlIHdlIGNhcmUgYWJv dXQgaGVyZSBpcyBOU0ZpbGVQcm9taXNlRHJhZ1NvdXJjZSwgd2hpY2ggZG9lc24ndCBsb29rIGF0 Ci0gICAgLy8gdGhlIGFyZ3VtZW50cy4gSXQncyBPSyB0byBqdXN0IHBhc3MgYXJiaXRyYXJ5IGNv bnN0YW50IHZhbHVlcywgc28gd2UganVzdCBwYXNzIGFsbCB6ZXJvZXMuCi0gICAgW21fZHJhZ1Nv dXJjZS5nZXQoKSBkcmFnZ2VkSW1hZ2U6bmlsIGVuZGVkQXQ6TlNaZXJvUG9pbnQgb3BlcmF0aW9u Ok5TRHJhZ09wZXJhdGlvbk5vbmVdOwotICAgIG1fZHJhZ1NvdXJjZSA9IG51bGxwdHI7Ci19Ci0K IHZvaWQgV2ViUGFnZTo6c2hvdWxkRGVsYXlXaW5kb3dPcmRlcmluZ0V2ZW50KGNvbnN0IFdlYktp dDo6V2ViTW91c2VFdmVudCYgZXZlbnQsIGJvb2wmIHJlc3VsdCkKIHsKICAgICByZXN1bHQgPSBm YWxzZTsK