68291 2011-09-16 16:36:36 -0700 ASSERTION FAILED: documentLoader in WebKit/Source/WebCore/inspector/InspectorInstrumentation.cpp(597) 2011-09-23 03:46:29 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tony vsevik ap loislo pfeldman vsevik yurys oldest_to_newest 468894 0 tony 2011-09-16 16:36:36 -0700 When loading a multipart page, I hit this assert in Chrome. It seems to work fine when using test_shell. ASSERTION FAILED: documentLoader ../../third_party/WebKit/Source/WebCore/inspector/InspectorInstrumentation.cpp(597) : static void WebCore::InspectorInstrumentation::loadEventFiredImpl(WebCore::InstrumentingAgents*, WebCore::Frame*, const WebCore::KURL&) Specifically, if I run "out/Debug/chrome http://localhost:8099/multipart", I hit the assert. I've attached the python webserver (just run python test-server-simple.py to launch). 468895 1 107745 tony 2011-09-16 16:37:26 -0700 Created attachment 107745 test server 470936 2 vsevik 2011-09-21 10:55:07 -0700 Probably related: http://code.google.com/p/chromium/issues/detail?id=94392 471517 3 108323 vsevik 2011-09-22 06:15:52 -0700 Created attachment 108323 Patch 471524 4 vsevik 2011-09-22 06:29:14 -0700 I was not able to reproduce this bug, but this piece of code could be simplified to ensure this does not happens anymore. 471669 5 108323 webkit.review.bot 2011-09-22 10:27:48 -0700 Comment on attachment 108323 Patch Attachment 108323 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/9794302 471727 6 108368 vsevik 2011-09-22 11:18:56 -0700 Created attachment 108368 Patch 471929 7 108368 tony 2011-09-22 16:13:42 -0700 Comment on attachment 108368 Patch Seems fine. Might want to have someone more familiar with Inspector code also take a look. 472091 8 yurys 2011-09-22 23:47:48 -0700 (In reply to comment #7) > (From update of attachment 108368 [details]) > Seems fine. Might want to have someone more familiar with Inspector code also take a look. Tony, are you sure url != documentLoader->requestURL() check was redundant there? 472099 9 108368 yurys 2011-09-23 00:21:14 -0700 Comment on attachment 108368 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=108368&action=review > Source/WebCore/inspector/InspectorInstrumentation.cpp:-602 > - if (frame->page()->mainFrame() != frame || url != documentLoader->requestURL()) Do we receive load event notifications only for the frame main resource? If not, the check should be preserved. 472137 10 vsevik 2011-09-23 03:20:21 -0700 (In reply to comment #9) > (From update of attachment 108368 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=108368&action=review > > > Source/WebCore/inspector/InspectorInstrumentation.cpp:-602 > > - if (frame->page()->mainFrame() != frame || url != documentLoader->requestURL()) > > Do we receive load event notifications only for the frame main resource? If not, the check should be preserved. loadEventFired() and domContentLoadedEventFired() are called only from DOMWindow and Document always passing frame main resource url. 472149 11 vsevik 2011-09-23 03:46:29 -0700 Committed r95790: <http://trac.webkit.org/changeset/95790> 107745 2011-09-16 16:37:26 -0700 2011-09-16 16:37:26 -0700 test server testserver-simple.py text/plain 909 tony IyEvdXNyL2Jpbi9weXRob24KCmltcG9ydCBCYXNlSFRUUFNlcnZlcgppbXBvcnQgdGltZQoKY2xh c3MgUGFnZUhhbmRsZXIoQmFzZUhUVFBTZXJ2ZXIuQmFzZUhUVFBSZXF1ZXN0SGFuZGxlcik6Cgog IGRlZiBkb19HRVQoc2VsZik6CiAgICBpZiBzZWxmLnBhdGggPT0gJy9tdWx0aXBhcnQnOgogICAg ICBzZWxmLk11bHRpcGFydEhhbmRsZXIoKQoKICBkZWYgTXVsdGlwYXJ0SGFuZGxlcihzZWxmKToK ICAgIG51bV9mcmFtZXMgPSA1CiAgICBib3VuZCA9ICcxMjM0NScKICAgIHNlbGYuc2VuZF9yZXNw b25zZSgyMDApCiAgICBzZWxmLnNlbmRfaGVhZGVyKCdDb250ZW50LXR5cGUnLAogICAgICAgICAg ICAgICAgICAgICAnbXVsdGlwYXJ0L3gtbWl4ZWQtcmVwbGFjZTtib3VuZGFyeT0nICsgYm91bmQp CiAgICBzZWxmLmVuZF9oZWFkZXJzKCkKCiAgICBmb3IgaSBpbiB4cmFuZ2UobnVtX2ZyYW1lcyk6 CiAgICAgIHNlbGYud2ZpbGUud3JpdGUoJy0tJyArIGJvdW5kICsgJ1xyXG4nKQogICAgICBzZWxm LndmaWxlLndyaXRlKCdDb250ZW50LXR5cGU6IHRleHQvaHRtbFxyXG5cclxuJykKICAgICAgc2Vs Zi53ZmlsZS5mbHVzaCgpCiAgICAgIHRpbWUuc2xlZXAoMSkKICAgICAgc2VsZi53ZmlsZS53cml0 ZSgnPHRpdGxlPnBhZ2UgJyArIHN0cihpKSArICc8L3RpdGxlPicpCiAgICAgIHNlbGYud2ZpbGUu d3JpdGUoJ3BhZ2UgJyArIHN0cihpKSArICc8IS0tICcgKyAoJ3gnICogMjA0OCkgKyAnLS0+JykK CiAgICBzZWxmLndmaWxlLndyaXRlKCctLScgKyBib3VuZCArICctLScpCiAgICByZXR1cm4gVHJ1 ZQoKCnNlcnZlciA9IEJhc2VIVFRQU2VydmVyLkhUVFBTZXJ2ZXIoKCcxMjcuMC4wLjEnLCA4MDk5 KSwgUGFnZUhhbmRsZXIpCndoaWxlIFRydWU6CiAgc2VydmVyLmhhbmRsZV9yZXF1ZXN0KCkK 108323 2011-09-22 06:15:52 -0700 2011-09-22 11:18:49 -0700 Patch bug-68291-20110922171550.patch text/plain 2527 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTU3MDcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjNjMwN2VjYWMzMDBiMDBh MDI3NzFmOTM5MTQ5YTFjZDZhODg3YjBiLi5kNDA1NTJhYjU4N2Y4ZjZiNjJkZTYwZTczMTc2Mzlh ZmIwMjA2MDMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDktMjIgIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQVNTRVJUSU9OIEZB SUxFRDogZG9jdW1lbnRMb2FkZXIgaW4gV2ViS2l0L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwKDU5NykKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MjkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZG9t Q29udGVudExvYWRlZEV2ZW50RmlyZWRJbXBsKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6bG9hZEV2ZW50RmlyZWRJbXBsKToKKwogMjAxMS0wOS0yMiAgSmFt ZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJvbGxpbmcgb3V0IHI5NTY5OS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAKaW5kZXggNDlkZGZjNTMwMmY0YTJkZTFhMzY1 YTdhMDM5NDBlNmUxNDY0NWI5OC4uNDIyODdhNDlmMjAxZTc0MmZjZDAyNTUzYTdjYWJlNmI5OGNk ZTM2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3Ry dW1lbnRhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvcklu c3RydW1lbnRhdGlvbi5jcHAKQEAgLTU3MiwxMCArNTcyLDcgQEAgdm9pZCBJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb246OmRpZFJlY2VpdmVTY3JpcHRSZXNwb25zZUltcGwoSW5zdHJ1bWVudGluZ0Fn ZW50cyoKIAogdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRvbUNvbnRlbnRMb2FkZWRF dmVudEZpcmVkSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzLCBG cmFtZSogZnJhbWUsIGNvbnN0IEtVUkwmIHVybCkKIHsKLSAgICBEb2N1bWVudExvYWRlciogZG9j dW1lbnRMb2FkZXIgPSBmcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCk7Ci0gICAgQVNT RVJUKGRvY3VtZW50TG9hZGVyKTsKLQotICAgIGlmIChmcmFtZS0+cGFnZSgpLT5tYWluRnJhbWUo KSAhPSBmcmFtZSB8fCB1cmwgIT0gZG9jdW1lbnRMb2FkZXItPnJlcXVlc3RVUkwoKSkKKyAgICBp ZiAoZnJhbWUtPnBhZ2UoKS0+bWFpbkZyYW1lKCkgIT0gZnJhbWUpCiAgICAgICAgIHJldHVybjsK IAogICAgIGlmIChJbnNwZWN0b3JBZ2VudCogaW5zcGVjdG9yQWdlbnQgPSBpbnN0cnVtZW50aW5n QWdlbnRzLT5pbnNwZWN0b3JBZ2VudCgpKQpAQCAtNTkzLDEzICs1OTAsMTAgQEAgdm9pZCBJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb246OmRvbUNvbnRlbnRMb2FkZWRFdmVudEZpcmVkSW1wbChJbnN0 cnVtZW50aW5nQWdlbnQKIAogdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmxvYWRFdmVu dEZpcmVkSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzLCBGcmFt ZSogZnJhbWUsIGNvbnN0IEtVUkwmIHVybCkKIHsKLSAgICBEb2N1bWVudExvYWRlciogZG9jdW1l bnRMb2FkZXIgPSBmcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCk7Ci0gICAgQVNTRVJU KGRvY3VtZW50TG9hZGVyKTsKLQogICAgIGlmIChJbnNwZWN0b3JET01BZ2VudCogZG9tQWdlbnQg PSBpbnN0cnVtZW50aW5nQWdlbnRzLT5pbnNwZWN0b3JET01BZ2VudCgpKQotICAgICAgICBkb21B Z2VudC0+bG9hZEV2ZW50RmlyZWQoZG9jdW1lbnRMb2FkZXItPmZyYW1lKCktPmRvY3VtZW50KCkp OworICAgICAgICBkb21BZ2VudC0+bG9hZEV2ZW50RmlyZWQoZnJhbWUtPmRvY3VtZW50KCkpOwog Ci0gICAgaWYgKGZyYW1lLT5wYWdlKCktPm1haW5GcmFtZSgpICE9IGZyYW1lIHx8IHVybCAhPSBk b2N1bWVudExvYWRlci0+cmVxdWVzdFVSTCgpKQorICAgIGlmIChmcmFtZS0+cGFnZSgpLT5tYWlu RnJhbWUoKSAhPSBmcmFtZSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKEluc3BlY3RvclRp bWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRzLT5pbnNwZWN0 b3JUaW1lbGluZUFnZW50KCkpCg== 108368 2011-09-22 11:18:56 -0700 2011-09-23 00:21:14 -0700 Patch bug-68291-20110922221854.patch text/plain 7220 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTU3MDcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjNjMwN2VjYWMzMDBiMDBh MDI3NzFmOTM5MTQ5YTFjZDZhODg3YjBiLi5iNjQ3M2JiMDA4NzMxN2I5ZjFkZjJjM2NkMjFkN2Jm MjU3NTRhNGE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDktMjIgIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQVNTRVJUSU9OIEZB SUxFRDogZG9jdW1lbnRMb2FkZXIgaW4gV2ViS2l0L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwKDU5NykKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MjkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RG9jdW1lbnQ6OmZpbmlzaGVkUGFyc2luZyk6CisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb246OmRvbUNvbnRlbnRMb2FkZWRFdmVudEZpcmVkSW1wbCk6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmxvYWRFdmVudEZpcmVkSW1wbCk6 CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkb21Db250ZW50TG9hZGVkRXZl bnRGaXJlZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246Omxv YWRFdmVudEZpcmVkKToKKyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpET01XaW5kb3c6OmRpc3BhdGNoTG9hZEV2ZW50KToKKwogMjAxMS0wOS0yMiAgSmFt ZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJvbGxpbmcgb3V0IHI5NTY5OS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IGQ2YTI1MmMw MTk5OTAxN2ZjZmJhMWUzNWM0MTBjMDk0YjA0Y2U2Y2IuLjM4MTc4MDZkNzM3MDAwOGFlMmJhM2Ni NTA3YjYzNGEzZmM5NDQ2MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtNDI4NCw3ICs0 Mjg0LDcgQEAgdm9pZCBEb2N1bWVudDo6ZmluaXNoZWRQYXJzaW5nKCkKIAogICAgICAgICBmLT5s b2FkZXIoKS0+ZmluaXNoZWRQYXJzaW5nKCk7CiAKLSAgICAgICAgSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uOjpkb21Db250ZW50TG9hZGVkRXZlbnRGaXJlZChmLmdldCgpLCB1cmwoKSk7CisgICAg ICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZG9tQ29udGVudExvYWRlZEV2ZW50RmlyZWQo Zi5nZXQoKSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCmluZGV4IDQ5ZGRmYzUzMDJmNGEyZGUxYTM2 NWE3YTAzOTQwZTZlMTQ2NDViOTguLmJlZjZkMTRjOGQ4OGRhMWJlNjhhYzI5MzIyOThlYmQwMGMy YWM2NmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0 cnVtZW50YXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJ bnN0cnVtZW50YXRpb24uY3BwCkBAIC01NzAsMTIgKzU3MCw5IEBAIHZvaWQgSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uOjpkaWRSZWNlaXZlU2NyaXB0UmVzcG9uc2VJbXBsKEluc3RydW1lbnRpbmdB Z2VudHMqCiAgICAgICAgIHJlc291cmNlQWdlbnQtPmRpZFJlY2VpdmVTY3JpcHRSZXNwb25zZShp ZGVudGlmaWVyKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRvbUNvbnRl bnRMb2FkZWRFdmVudEZpcmVkSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5n QWdlbnRzLCBGcmFtZSogZnJhbWUsIGNvbnN0IEtVUkwmIHVybCkKK3ZvaWQgSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uOjpkb21Db250ZW50TG9hZGVkRXZlbnRGaXJlZEltcGwoSW5zdHJ1bWVudGlu Z0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywgRnJhbWUqIGZyYW1lKQogewotICAgIERvY3Vt ZW50TG9hZGVyKiBkb2N1bWVudExvYWRlciA9IGZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2Fk ZXIoKTsKLSAgICBBU1NFUlQoZG9jdW1lbnRMb2FkZXIpOwotCi0gICAgaWYgKGZyYW1lLT5wYWdl KCktPm1haW5GcmFtZSgpICE9IGZyYW1lIHx8IHVybCAhPSBkb2N1bWVudExvYWRlci0+cmVxdWVz dFVSTCgpKQorICAgIGlmIChmcmFtZS0+cGFnZSgpLT5tYWluRnJhbWUoKSAhPSBmcmFtZSkKICAg ICAgICAgcmV0dXJuOwogCiAgICAgaWYgKEluc3BlY3RvckFnZW50KiBpbnNwZWN0b3JBZ2VudCA9 IGluc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckFnZW50KCkpCkBAIC01OTEsMTUgKzU4OCwx MiBAQCB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZG9tQ29udGVudExvYWRlZEV2ZW50 RmlyZWRJbXBsKEluc3RydW1lbnRpbmdBZ2VudAogICAgICAgICBwYWdlQWdlbnQtPmRvbUNvbnRl bnRFdmVudEZpcmVkKCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpsb2Fk RXZlbnRGaXJlZEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywg RnJhbWUqIGZyYW1lLCBjb25zdCBLVVJMJiB1cmwpCit2b2lkIEluc3BlY3Rvckluc3RydW1lbnRh dGlvbjo6bG9hZEV2ZW50RmlyZWRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRp bmdBZ2VudHMsIEZyYW1lKiBmcmFtZSkKIHsKLSAgICBEb2N1bWVudExvYWRlciogZG9jdW1lbnRM b2FkZXIgPSBmcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCk7Ci0gICAgQVNTRVJUKGRv Y3VtZW50TG9hZGVyKTsKLQogICAgIGlmIChJbnNwZWN0b3JET01BZ2VudCogZG9tQWdlbnQgPSBp bnN0cnVtZW50aW5nQWdlbnRzLT5pbnNwZWN0b3JET01BZ2VudCgpKQotICAgICAgICBkb21BZ2Vu dC0+bG9hZEV2ZW50RmlyZWQoZG9jdW1lbnRMb2FkZXItPmZyYW1lKCktPmRvY3VtZW50KCkpOwor ICAgICAgICBkb21BZ2VudC0+bG9hZEV2ZW50RmlyZWQoZnJhbWUtPmRvY3VtZW50KCkpOwogCi0g ICAgaWYgKGZyYW1lLT5wYWdlKCktPm1haW5GcmFtZSgpICE9IGZyYW1lIHx8IHVybCAhPSBkb2N1 bWVudExvYWRlci0+cmVxdWVzdFVSTCgpKQorICAgIGlmIChmcmFtZS0+cGFnZSgpLT5tYWluRnJh bWUoKSAhPSBmcmFtZSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKEluc3BlY3RvclRpbWVs aW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRzLT5pbnNwZWN0b3JU aW1lbGluZUFnZW50KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uLmgKaW5kZXggYjY5ODEyNWE4NzZkZjg4MmYzZDEyM2E3Y2VlMjU0 M2EwZTQ3NWU0ZS4uZWQ5NTAxNWExNjJkODRiM2Q4ZmNjZmYyZmU3ZTc2ZTYxODJhNGRiNyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlv bi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRp b24uaApAQCAtMTM4LDggKzEzOCw4IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgdm9pZCBkaWRMb2Fk WEhSU3luY2hyb25vdXNseShTY3JpcHRFeGVjdXRpb25Db250ZXh0Kik7CiAgICAgc3RhdGljIHZv aWQgc2NyaXB0SW1wb3J0ZWQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIHVuc2lnbmVkIGxvbmcg aWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBzb3VyY2VTdHJpbmcpOwogICAgIHN0YXRpYyB2b2lk IGRpZFJlY2VpdmVTY3JpcHRSZXNwb25zZShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgdW5zaWdu ZWQgbG9uZyBpZGVudGlmaWVyKTsKLSAgICBzdGF0aWMgdm9pZCBkb21Db250ZW50TG9hZGVkRXZl bnRGaXJlZChGcmFtZSosIGNvbnN0IEtVUkwmKTsKLSAgICBzdGF0aWMgdm9pZCBsb2FkRXZlbnRG aXJlZChGcmFtZSosIGNvbnN0IEtVUkwmKTsKKyAgICBzdGF0aWMgdm9pZCBkb21Db250ZW50TG9h ZGVkRXZlbnRGaXJlZChGcmFtZSopOworICAgIHN0YXRpYyB2b2lkIGxvYWRFdmVudEZpcmVkKEZy YW1lKik7CiAgICAgc3RhdGljIHZvaWQgZnJhbWVEZXRhY2hlZEZyb21QYXJlbnQoRnJhbWUqKTsK ICAgICBzdGF0aWMgdm9pZCBkaWRDb21taXRMb2FkKEZyYW1lKiwgRG9jdW1lbnRMb2FkZXIqKTsK ICAgICBzdGF0aWMgdm9pZCBsb2FkZXJEZXRhY2hlZEZyb21GcmFtZShGcmFtZSosIERvY3VtZW50 TG9hZGVyKik7CkBAIC0yNzIsOCArMjcyLDggQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgdm9pZCBk aWRMb2FkWEhSU3luY2hyb25vdXNseUltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyopOwogICAgIHN0 YXRpYyB2b2lkIHNjcmlwdEltcG9ydGVkSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiwgdW5zaWdu ZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIHNvdXJjZVN0cmluZyk7CiAgICAgc3Rh dGljIHZvaWQgZGlkUmVjZWl2ZVNjcmlwdFJlc3BvbnNlSW1wbChJbnN0cnVtZW50aW5nQWdlbnRz KiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKTsKLSAgICBzdGF0aWMgdm9pZCBkb21Db250ZW50 TG9hZGVkRXZlbnRGaXJlZEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyosIEZyYW1lKiwgY29uc3Qg S1VSTCYpOwotICAgIHN0YXRpYyB2b2lkIGxvYWRFdmVudEZpcmVkSW1wbChJbnN0cnVtZW50aW5n QWdlbnRzKiwgRnJhbWUqLCBjb25zdCBLVVJMJik7CisgICAgc3RhdGljIHZvaWQgZG9tQ29udGVu dExvYWRlZEV2ZW50RmlyZWRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqLCBGcmFtZSopOworICAg IHN0YXRpYyB2b2lkIGxvYWRFdmVudEZpcmVkSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiwgRnJh bWUqKTsKICAgICBzdGF0aWMgdm9pZCBmcmFtZURldGFjaGVkRnJvbVBhcmVudEltcGwoSW5zdHJ1 bWVudGluZ0FnZW50cyosIEZyYW1lKik7CiAgICAgc3RhdGljIHZvaWQgZGlkQ29tbWl0TG9hZElt cGwoSW5zdHJ1bWVudGluZ0FnZW50cyosIFBhZ2UqLCBEb2N1bWVudExvYWRlciopOwogICAgIHN0 YXRpYyB2b2lkIGxvYWRlckRldGFjaGVkRnJvbUZyYW1lSW1wbChJbnN0cnVtZW50aW5nQWdlbnRz KiwgRG9jdW1lbnRMb2FkZXIqKTsKQEAgLTg2NywxOSArODY3LDE5IEBAIGlubGluZSB2b2lkIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVjZWl2ZVNjcmlwdFJlc3BvbnNlKFNjcmlwdEV4 ZWN1dGlvbkNvCiAjZW5kaWYKIH0KIAotaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjpkb21Db250ZW50TG9hZGVkRXZlbnRGaXJlZChGcmFtZSogZnJhbWUsIGNvbnN0IEtVUkwm IHVybCkKK2lubGluZSB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZG9tQ29udGVudExv YWRlZEV2ZW50RmlyZWQoRnJhbWUqIGZyYW1lKQogewogI2lmIEVOQUJMRShJTlNQRUNUT1IpCiAg ICAgaWYgKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMgPSBpbnN0cnVt ZW50aW5nQWdlbnRzRm9yRnJhbWUoZnJhbWUpKQotICAgICAgICBkb21Db250ZW50TG9hZGVkRXZl bnRGaXJlZEltcGwoaW5zdHJ1bWVudGluZ0FnZW50cywgZnJhbWUsIHVybCk7CisgICAgICAgIGRv bUNvbnRlbnRMb2FkZWRFdmVudEZpcmVkSW1wbChpbnN0cnVtZW50aW5nQWdlbnRzLCBmcmFtZSk7 CiAjZW5kaWYKIH0KIAotaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpsb2Fk RXZlbnRGaXJlZChGcmFtZSogZnJhbWUsIGNvbnN0IEtVUkwmIHVybCkKK2lubGluZSB2b2lkIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6bG9hZEV2ZW50RmlyZWQoRnJhbWUqIGZyYW1lKQogewog I2lmIEVOQUJMRShJTlNQRUNUT1IpCiAgICAgaWYgKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3Ry dW1lbnRpbmdBZ2VudHMgPSBpbnN0cnVtZW50aW5nQWdlbnRzRm9yRnJhbWUoZnJhbWUpKQotICAg ICAgICBsb2FkRXZlbnRGaXJlZEltcGwoaW5zdHJ1bWVudGluZ0FnZW50cywgZnJhbWUsIHVybCk7 CisgICAgICAgIGxvYWRFdmVudEZpcmVkSW1wbChpbnN0cnVtZW50aW5nQWdlbnRzLCBmcmFtZSk7 CiAjZW5kaWYKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCmluZGV4IDI4NDFmZTdlYjA2 OGZkODQzM2E3MTcyNDAxMDRkMjEwMjU0Zjk4NTQuLjNjMGY3ODJhZTdiZTEyMTBkZTRjNjNlZDcx NWVhYjNkMWQ2Yjg2MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKQEAgLTE1ODAsNyAr MTU4MCw3IEBAIHZvaWQgRE9NV2luZG93OjpkaXNwYXRjaExvYWRFdmVudCgpCiAgICAgaWYgKG93 bmVyRWxlbWVudCkKICAgICAgICAgb3duZXJFbGVtZW50LT5kaXNwYXRjaEV2ZW50KEV2ZW50Ojpj cmVhdGUoZXZlbnROYW1lcygpLmxvYWRFdmVudCwgZmFsc2UsIGZhbHNlKSk7CiAKLSAgICBJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb246OmxvYWRFdmVudEZpcmVkKGZyYW1lKCksIHVybCgpKTsKKyAg ICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmxvYWRFdmVudEZpcmVkKGZyYW1lKCkpOwogfQog CiBib29sIERPTVdpbmRvdzo6ZGlzcGF0Y2hFdmVudChQYXNzUmVmUHRyPEV2ZW50PiBwcnBFdmVu dCwgUGFzc1JlZlB0cjxFdmVudFRhcmdldD4gcHJwVGFyZ2V0KQo=