64212 2011-07-08 15:56:42 -0700 REGRESSION(r90662): Chromium gtests exposed a bug where we return the end value for selectionStart (Requested by ojan on #webkit). 2011-07-11 10:59:38 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 64133 1 commit-queue commit-queue dglazkov rniwa webkit.review.bot oldest_to_newest 434350 0 commit-queue 2011-07-08 15:56:42 -0700 http://trac.webkit.org/changeset/90662 broke the build: Chromium gtests exposed a bug where we return the end value for selectionStart (Requested by ojan on #webkit). This is an automatic bug report generated by the sheriff-bot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests case pain. "Only you can prevent forest fires." -- Smokey the Bear 434351 1 100174 commit-queue 2011-07-08 15:56:50 -0700 Created attachment 100174 ROLLOUT of r90662 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID --ignore-builders where ATTACHMENT_ID is the ID of this attachment. 434356 2 100174 ojan 2011-07-08 15:57:49 -0700 Comment on attachment 100174 ROLLOUT of r90662 Confirmed with rniwa on #chromium that he'd like to rollback. 434358 3 100174 webkit.review.bot 2011-07-08 15:59:08 -0700 Comment on attachment 100174 ROLLOUT of r90662 Rejecting attachment 100174 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-01', '--port..." exit_code: 2 Last 500 characters of output: ed at 111 with fuzz 2 (offset 5 lines). 3 out of 4 hunks FAILED -- saving rejects to file Source/WebCore/rendering/RenderTextControl.h.rej patching file Source/WebKit/qt/Api/qwebpage.cpp Hunk #1 FAILED at 1111. Hunk #2 FAILED at 1134. 2 out of 2 hunks FAILED -- saving rejects to file Source/WebKit/qt/Api/qwebpage.cpp.rej patching file Source/WebKit/qt/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/8995896 100174 2011-07-08 15:56:50 -0700 2011-07-08 15:59:07 -0700 ROLLOUT of r90662 bug-64212-20110708155649.patch text/plain 22478 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogOTA2NzAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlYmJlYmIzYzRmYzMwYmY1 ZGUyZjdhMGMwYWQyMjk0YTE1YjI3Y2E5Li4wNmRjNmM1MWZiNjM4YmQ1ZTMzNmU2MWIwOWIwMThi MDRkMzQ5NzFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMDctMDggIEFkYW0g QmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2VkLCByb2xsaW5n IG91dCByOTA2NjIuCisgICAgICAgIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0Lzkw NjYyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDIx MgorCisgICAgICAgIENocm9taXVtIGd0ZXN0cyBleHBvc2VkIGEgYnVnIHdoZXJlIHdlIHJldHVy biB0aGUgZW5kIHZhbHVlCisgICAgICAgIGZvciBzZWxlY3Rpb25TdGFydCAoUmVxdWVzdGVkIGJ5 IG9qYW4gb24gI3dlYmtpdCkuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlSZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdDo6c2VsZWN0ZWRUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlS ZW5kZXJPYmplY3Q6OnNlbGVjdGVkVGV4dFJhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vz c2liaWxpdHlSZW5kZXJPYmplY3Q6OnNldFNlbGVjdGVkVGV4dFJhbmdlKToKKyAgICAgICAgKiBo dG1sL0hUTUxGb3JtQ29udHJvbEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRl eHRGb3JtQ29udHJvbEVsZW1lbnQ6OnNldFNlbGVjdGlvblJhbmdlKToKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50OjpzZWxlY3Rpb25TdGFydCk6CisgICAgICAg IChXZWJDb3JlOjpIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudDo6c2VsZWN0aW9uRW5kKToKKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50OjpzZWxlY3Rpb24pOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6OnJlc3RvcmVDYWNo ZWRTZWxlY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRleHRGb3JtQ29udHJvbEVsZW1l bnQ6OnNlbGVjdGlvbkNoYW5nZWQpOgorICAgICAgICAqIGh0bWwvSFRNTEZvcm1Db250cm9sRWxl bWVudC5oOgorICAgICAgICAqIGh0bWwvSFRNTElucHV0RWxlbWVudC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpIVE1MSW5wdXRFbGVtZW50OjpzZXRWYWx1ZSk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlclRleHRDb250cm9sLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRDb250 cm9sOjpzZWxlY3Rpb25TdGFydCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0Q29udHJv bDo6c2VsZWN0aW9uRW5kKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRDb250cm9sOjpo YXNWaXNpYmxlVGV4dEFyZWEpOgorICAgICAgICAoV2ViQ29yZTo6c2V0U2VsZWN0aW9uUmFuZ2Up OgorICAgICAgICAoV2ViQ29yZTo6c2V0Q29udGFpbmVyQW5kT2Zmc2V0Rm9yUmFuZ2UpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dENvbnRyb2w6OnNlbGVjdGlvbik6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmg6CisKIDIwMTEtMDctMDggIEJyaWFuIFNhbG9t b24gIDxic2Fsb21vbkBnb29nbGUuY29tPgogCiAgICAgICAgIE1ha2UgR0wgY29udGV4dCBjdXJy ZW50IGJlZm9yZSB1cGRhdGluZyBsYXllciB0ZXh0dXJlIHVzaW5nIHNraWEtZ3B1CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmpl Y3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVy T2JqZWN0LmNwcAppbmRleCA2NmNiMzAxOTU2ZmUxMGQ5OWJlYmRhNWY4MGJjZWUzOWViZTQ4NTlj Li5kZGVkOGU2YTk2NDg1OTE3ZjUyYmQ3Y2RkNzE1Y2EzZjJhZjYxODk0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9i amVjdC5jcHAKQEAgLTE5OTQsOCArMTk5NCw4IEBAIFN0cmluZyBBY2Nlc3NpYmlsaXR5UmVuZGVy T2JqZWN0OjpzZWxlY3RlZFRleHQoKSBjb25zdAogICAgICAgICByZXR1cm4gU3RyaW5nKCk7IC8v IG5lZWQgdG8gcmV0dXJuIHNvbWV0aGluZyBkaXN0aW5jdCBmcm9tIGVtcHR5IHN0cmluZwogICAg IAogICAgIGlmIChpc05hdGl2ZVRleHRDb250cm9sKCkpIHsKLSAgICAgICAgSFRNTFRleHRGb3Jt Q29udHJvbEVsZW1lbnQqIHRleHRDb250cm9sID0gdG9SZW5kZXJUZXh0Q29udHJvbChtX3JlbmRl cmVyKS0+dGV4dEZvcm1Db250cm9sRWxlbWVudCgpOwotICAgICAgICByZXR1cm4gdGV4dENvbnRy b2wtPnNlbGVjdGVkVGV4dCgpOworICAgICAgICBSZW5kZXJUZXh0Q29udHJvbCogdGV4dENvbnRy b2wgPSB0b1JlbmRlclRleHRDb250cm9sKG1fcmVuZGVyZXIpOworICAgICAgICByZXR1cm4gdGV4 dENvbnRyb2wtPnRleHQoKS5zdWJzdHJpbmcodGV4dENvbnRyb2wtPnNlbGVjdGlvblN0YXJ0KCks IHRleHRDb250cm9sLT5zZWxlY3Rpb25FbmQoKSAtIHRleHRDb250cm9sLT5zZWxlY3Rpb25TdGFy dCgpKTsKICAgICB9CiAgICAgCiAgICAgaWYgKGFyaWFSb2xlQXR0cmlidXRlKCkgPT0gVW5rbm93 blJvbGUpCkBAIC0yMDI4LDcgKzIwMjgsNyBAQCBQbGFpblRleHRSYW5nZSBBY2Nlc3NpYmlsaXR5 UmVuZGVyT2JqZWN0OjpzZWxlY3RlZFRleHRSYW5nZSgpIGNvbnN0CiAgICAgCiAgICAgQWNjZXNz aWJpbGl0eVJvbGUgYXJpYVJvbGUgPSBhcmlhUm9sZUF0dHJpYnV0ZSgpOwogICAgIGlmIChpc05h dGl2ZVRleHRDb250cm9sKCkgJiYgYXJpYVJvbGUgPT0gVW5rbm93blJvbGUpIHsKLSAgICAgICAg SFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQqIHRleHRDb250cm9sID0gdG9SZW5kZXJUZXh0Q29u dHJvbChtX3JlbmRlcmVyKS0+dGV4dEZvcm1Db250cm9sRWxlbWVudCgpOworICAgICAgICBSZW5k ZXJUZXh0Q29udHJvbCogdGV4dENvbnRyb2wgPSB0b1JlbmRlclRleHRDb250cm9sKG1fcmVuZGVy ZXIpOwogICAgICAgICByZXR1cm4gUGxhaW5UZXh0UmFuZ2UodGV4dENvbnRyb2wtPnNlbGVjdGlv blN0YXJ0KCksIHRleHRDb250cm9sLT5zZWxlY3Rpb25FbmQoKSAtIHRleHRDb250cm9sLT5zZWxl Y3Rpb25TdGFydCgpKTsKICAgICB9CiAgICAgCkBAIC0yMDQxLDggKzIwNDEsNyBAQCBQbGFpblRl eHRSYW5nZSBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpzZWxlY3RlZFRleHRSYW5nZSgpIGNv bnN0CiB2b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnNldFNlbGVjdGVkVGV4dFJhbmdl KGNvbnN0IFBsYWluVGV4dFJhbmdlJiByYW5nZSkKIHsKICAgICBpZiAoaXNOYXRpdmVUZXh0Q29u dHJvbCgpKSB7Ci0gICAgICAgIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50KiB0ZXh0Q29udHJv bCA9IHRvUmVuZGVyVGV4dENvbnRyb2wobV9yZW5kZXJlciktPnRleHRGb3JtQ29udHJvbEVsZW1l bnQoKTsKLSAgICAgICAgdGV4dENvbnRyb2wtPnNldFNlbGVjdGlvblJhbmdlKHJhbmdlLnN0YXJ0 LCByYW5nZS5zdGFydCArIHJhbmdlLmxlbmd0aCk7CisgICAgICAgIHNldFNlbGVjdGlvblJhbmdl KG1fcmVuZGVyZXItPm5vZGUoKSwgcmFuZ2Uuc3RhcnQsIHJhbmdlLnN0YXJ0ICsgcmFuZ2UubGVu Z3RoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MRm9ybUNvbnRyb2xFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTEZvcm1Db250cm9sRWxlbWVudC5jcHAKaW5kZXggZTg2NGU4MDQ2NzIzMDlkNDZiNjAxZWI0 OTgyM2E3YzY3MWE1N2NmZC4uODIyZjA2ZTY5YjM3OGE2OTg0ZThkNTMwOWYzNDEwNDY3NTQxZDdj YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRm9ybUNvbnRyb2xFbGVtZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGb3JtQ29udHJvbEVsZW1lbnQuY3Bw CkBAIC02NjIsMTYgKzY2Miw2IEBAIHZvaWQgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6OnNl bGVjdCgpCiAgICAgc2V0U2VsZWN0aW9uUmFuZ2UoMCwgbnVtZXJpY19saW1pdHM8aW50Pjo6bWF4 KCkpOwogfQogCi1TdHJpbmcgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6OnNlbGVjdGVkVGV4 dCgpIGNvbnN0Ci17Ci0gICAgLy8gRklYTUU6IFdlIHNob3VsZCBiZSBhYmxlIHRvIGV4dHJhY3Qg c2VsZWN0ZWQgY29udGVudHMgZXZlbiBpZiB0aGVyZSB3ZXJlIG5vIHJlbmRlcmVyLgotICAgIGlm ICghcmVuZGVyZXIoKSB8fCByZW5kZXJlcigpLT5pc1RleHRDb250cm9sKCkpCi0gICAgICAgIHJl dHVybiBTdHJpbmcoKTsKLQotICAgIFJlbmRlclRleHRDb250cm9sKiB0ZXh0Q29udHJvbCA9IHRv UmVuZGVyVGV4dENvbnRyb2wocmVuZGVyZXIoKSk7Ci0gICAgcmV0dXJuIHRleHRDb250cm9sLT50 ZXh0KCkuc3Vic3RyaW5nKHNlbGVjdGlvblN0YXJ0KCksIHNlbGVjdGlvbkVuZCgpIC0gc2VsZWN0 aW9uU3RhcnQoKSk7Ci19Ci0KIHZvaWQgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6OmRpc3Bh dGNoRm9ybUNvbnRyb2xDaGFuZ2VFdmVudCgpCiB7CiAgICAgaWYgKG1fdGV4dEFzT2ZMYXN0Rm9y bUNvbnRyb2xDaGFuZ2VFdmVudCAhPSB2YWx1ZSgpKSB7CkBAIC02ODEsNDYgKzY3MSw5IEBAIHZv aWQgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6OmRpc3BhdGNoRm9ybUNvbnRyb2xDaGFuZ2VF dmVudCgpCiAgICAgc2V0Q2hhbmdlZFNpbmNlTGFzdEZvcm1Db250cm9sQ2hhbmdlRXZlbnQoZmFs c2UpOwogfQogCi1zdGF0aWMgaW5saW5lIGJvb2wgaGFzVmlzaWJsZVRleHRBcmVhKFJlbmRlclRl eHRDb250cm9sKiB0ZXh0Q29udHJvbCkKLXsKLSAgICBBU1NFUlQodGV4dENvbnRyb2wpOwotICAg IEhUTUxFbGVtZW50KiBpbm5lclRleHQgPSB0ZXh0Q29udHJvbC0+aW5uZXJUZXh0RWxlbWVudCgp OwotICAgIHJldHVybiB0ZXh0Q29udHJvbC0+c3R5bGUoKS0+dmlzaWJpbGl0eSgpICE9IEhJRERF TiAmJiBpbm5lclRleHQgJiYgaW5uZXJUZXh0LT5yZW5kZXJlcigpICYmIGlubmVyVGV4dC0+cmVu ZGVyQm94KCktPmhlaWdodCgpOwotfQotCiB2b2lkIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50 OjpzZXRTZWxlY3Rpb25SYW5nZShpbnQgc3RhcnQsIGludCBlbmQpCiB7Ci0gICAgZG9jdW1lbnQo KS0+dXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRzKCk7Ci0KLSAgICBpZiAoIXJl bmRlcmVyKCkgfHwgIXJlbmRlcmVyKCktPmlzVGV4dENvbnRyb2woKSkKLSAgICAgICAgcmV0dXJu OwotCi0gICAgZW5kID0gbWF4KGVuZCwgMCk7Ci0gICAgc3RhcnQgPSBtaW4obWF4KHN0YXJ0LCAw KSwgZW5kKTsKLQotICAgIFJlbmRlclRleHRDb250cm9sKiBjb250cm9sID0gdG9SZW5kZXJUZXh0 Q29udHJvbChyZW5kZXJlcigpKTsKLSAgICBpZiAoIWhhc1Zpc2libGVUZXh0QXJlYShjb250cm9s KSkgewotICAgICAgICBjYWNoZVNlbGVjdGlvbihzdGFydCwgZW5kKTsKLSAgICAgICAgcmV0dXJu OwotICAgIH0KLQotICAgIFZpc2libGVQb3NpdGlvbiBzdGFydFBvc2l0aW9uID0gY29udHJvbC0+ dmlzaWJsZVBvc2l0aW9uRm9ySW5kZXgoc3RhcnQpOwotICAgIFZpc2libGVQb3NpdGlvbiBlbmRQ b3NpdGlvbjsKLSAgICBpZiAoc3RhcnQgPT0gZW5kKQotICAgICAgICBlbmRQb3NpdGlvbiA9IHN0 YXJ0UG9zaXRpb247Ci0gICAgZWxzZQotICAgICAgICBlbmRQb3NpdGlvbiA9IGNvbnRyb2wtPnZp c2libGVQb3NpdGlvbkZvckluZGV4KGVuZCk7Ci0KLSAgICAvLyBzdGFydFBvc2l0aW9uIGFuZCBl bmRQb3NpdGlvbiBjYW4gYmUgbnVsbCBwb3NpdGlvbiBmb3IgZXhhbXBsZSB3aGVuCi0gICAgLy8g Ii13ZWJraXQtdXNlci1zZWxlY3Q6IG5vbmUiIHN0eWxlIGF0dHJpYnV0ZSBpcyBzcGVjaWZpZWQu Ci0gICAgaWYgKHN0YXJ0UG9zaXRpb24uaXNOb3ROdWxsKCkgJiYgZW5kUG9zaXRpb24uaXNOb3RO dWxsKCkpIHsKLSAgICAgICAgQVNTRVJUKHN0YXJ0UG9zaXRpb24uZGVlcEVxdWl2YWxlbnQoKS5k ZXByZWNhdGVkTm9kZSgpLT5zaGFkb3dBbmNlc3Rvck5vZGUoKSA9PSB0aGlzCi0gICAgICAgICAg ICAmJiBlbmRQb3NpdGlvbi5kZWVwRXF1aXZhbGVudCgpLmRlcHJlY2F0ZWROb2RlKCktPnNoYWRv d0FuY2VzdG9yTm9kZSgpID09IHRoaXMpOwotICAgIH0KLQotICAgIFZpc2libGVTZWxlY3Rpb24g bmV3U2VsZWN0aW9uID0gVmlzaWJsZVNlbGVjdGlvbihzdGFydFBvc2l0aW9uLCBlbmRQb3NpdGlv bik7Ci0gICAgaWYgKEZyYW1lKiBmcmFtZSA9IGRvY3VtZW50KCktPmZyYW1lKCkpCi0gICAgICAg IGZyYW1lLT5zZWxlY3Rpb24oKS0+c2V0U2VsZWN0aW9uKG5ld1NlbGVjdGlvbik7CisgICAgV2Vi Q29yZTo6c2V0U2VsZWN0aW9uUmFuZ2UodGhpcywgc3RhcnQsIGVuZCk7CiB9CiAKIGludCBIVE1M VGV4dEZvcm1Db250cm9sRWxlbWVudDo6c2VsZWN0aW9uU3RhcnQoKSBjb25zdApAQCAtNzI5LDE2 ICs2ODIsOSBAQCBpbnQgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6OnNlbGVjdGlvblN0YXJ0 KCkgY29uc3QKICAgICAgICAgcmV0dXJuIDA7CiAgICAgaWYgKGRvY3VtZW50KCktPmZvY3VzZWRO b2RlKCkgIT0gdGhpcyAmJiBoYXNDYWNoZWRTZWxlY3Rpb25TdGFydCgpKQogICAgICAgICByZXR1 cm4gbV9jYWNoZWRTZWxlY3Rpb25TdGFydDsKLQotICAgIEZyYW1lKiBmcmFtZSA9IGRvY3VtZW50 KCktPmZyYW1lKCk7Ci0gICAgaWYgKCFyZW5kZXJlcigpIHx8ICFmcmFtZSkKKyAgICBpZiAoIXJl bmRlcmVyKCkpCiAgICAgICAgIHJldHVybiAwOwotCi0gICAgSFRNTEVsZW1lbnQqIGlubmVyVGV4 dCA9IHRvUmVuZGVyVGV4dENvbnRyb2wocmVuZGVyZXIoKSktPmlubmVyVGV4dEVsZW1lbnQoKTsK LSAgICAvLyBEbyBub3QgY2FsbCBpbm5lclRleHRFbGVtZW50KCkgaW4gdGhlIGZ1bmN0aW9uIGFy Z3VtZW50cyBhcyBjcmVhdGluZyBhIFZpc2libGVQb3NpdGlvbgotICAgIC8vIGZyb20gZnJhbWUt PnNlbGVjdGlvbi0+c3RhcnQoKSBjYW4gYmxvdyB1cyBmcm9tIHVuZGVybmVhdGguIEFsc28sIGZ1 bmN0aW9uIG9yZGVyaW5nIGlzCi0gICAgLy8gdXN1YWxseSBkZXBlbmRlbnQgb24gdGhlIGNvbXBp bGVyLgotICAgIHJldHVybiBSZW5kZXJUZXh0Q29udHJvbDo6aW5kZXhGb3JWaXNpYmxlUG9zaXRp b24oaW5uZXJUZXh0LCBmcmFtZS0+c2VsZWN0aW9uKCktPnN0YXJ0KCkpOworICAgIHJldHVybiB0 b1JlbmRlclRleHRDb250cm9sKHJlbmRlcmVyKCkpLT5zZWxlY3Rpb25TdGFydCgpOwogfQogCiBp bnQgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6OnNlbGVjdGlvbkVuZCgpIGNvbnN0CkBAIC03 NDcsNjggKzY5MywyMSBAQCBpbnQgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6OnNlbGVjdGlv bkVuZCgpIGNvbnN0CiAgICAgICAgIHJldHVybiAwOwogICAgIGlmIChkb2N1bWVudCgpLT5mb2N1 c2VkTm9kZSgpICE9IHRoaXMgJiYgaGFzQ2FjaGVkU2VsZWN0aW9uRW5kKCkpCiAgICAgICAgIHJl dHVybiBtX2NhY2hlZFNlbGVjdGlvbkVuZDsKLQotICAgIEZyYW1lKiBmcmFtZSA9IGRvY3VtZW50 KCktPmZyYW1lKCk7Ci0gICAgaWYgKCFyZW5kZXJlcigpIHx8ICFmcmFtZSkKKyAgICBpZiAoIXJl bmRlcmVyKCkpCiAgICAgICAgIHJldHVybiAwOwotCi0gICAgSFRNTEVsZW1lbnQqIGlubmVyVGV4 dCA9IHRvUmVuZGVyVGV4dENvbnRyb2wocmVuZGVyZXIoKSktPmlubmVyVGV4dEVsZW1lbnQoKTsK LSAgICAvLyBEbyBub3QgY2FsbCBpbm5lclRleHRFbGVtZW50KCkgaW4gdGhlIGZ1bmN0aW9uIGFy Z3VtZW50cyBhcyBjcmVhdGluZyBhIFZpc2libGVQb3NpdGlvbgotICAgIC8vIGZyb20gZnJhbWUt PnNlbGVjdGlvbi0+c3RhcnQoKSBjYW4gYmxvdyB1cyBmcm9tIHVuZGVybmVhdGguIEFsc28sIGZ1 bmN0aW9uIG9yZGVyaW5nIGlzCi0gICAgLy8gdXN1YWxseSBkZXBlbmRlbnQgb24gdGhlIGNvbXBp bGVyLgotICAgIHJldHVybiBSZW5kZXJUZXh0Q29udHJvbDo6aW5kZXhGb3JWaXNpYmxlUG9zaXRp b24oaW5uZXJUZXh0LCBmcmFtZS0+c2VsZWN0aW9uKCktPmVuZCgpKTsKLX0KLQotc3RhdGljIGlu bGluZSB2b2lkIHNldENvbnRhaW5lckFuZE9mZnNldEZvclJhbmdlKE5vZGUqIG5vZGUsIGludCBv ZmZzZXQsIE5vZGUqJiBjb250YWluZXJOb2RlLCBpbnQmIG9mZnNldEluQ29udGFpbmVyKQotewot ICAgIGlmIChub2RlLT5pc1RleHROb2RlKCkpIHsKLSAgICAgICAgY29udGFpbmVyTm9kZSA9IG5v ZGU7Ci0gICAgICAgIG9mZnNldEluQ29udGFpbmVyID0gb2Zmc2V0OwotICAgIH0gZWxzZSB7Ci0g ICAgICAgIGNvbnRhaW5lck5vZGUgPSBub2RlLT5wYXJlbnROb2RlKCk7Ci0gICAgICAgIG9mZnNl dEluQ29udGFpbmVyID0gbm9kZS0+bm9kZUluZGV4KCkgKyBvZmZzZXQ7Ci0gICAgfQorICAgIHJl dHVybiB0b1JlbmRlclRleHRDb250cm9sKHJlbmRlcmVyKCkpLT5zZWxlY3Rpb25FbmQoKTsKIH0K IAogUGFzc1JlZlB0cjxSYW5nZT4gSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6OnNlbGVjdGlv bigpIGNvbnN0CiB7CiAgICAgaWYgKCFyZW5kZXJlcigpIHx8ICFpc1RleHRGb3JtQ29udHJvbCgp IHx8ICFoYXNDYWNoZWRTZWxlY3Rpb25TdGFydCgpIHx8ICFoYXNDYWNoZWRTZWxlY3Rpb25FbmQo KSkKICAgICAgICAgcmV0dXJuIDA7Ci0gICAgCi0gICAgaW50IHN0YXJ0ID0gbV9jYWNoZWRTZWxl Y3Rpb25TdGFydDsKLSAgICBpbnQgZW5kID0gbV9jYWNoZWRTZWxlY3Rpb25FbmQ7Ci0KLSAgICBB U1NFUlQoc3RhcnQgPD0gZW5kKTsKLSAgICBIVE1MRWxlbWVudCogaW5uZXJUZXh0ID0gdG9SZW5k ZXJUZXh0Q29udHJvbChyZW5kZXJlcigpKS0+aW5uZXJUZXh0RWxlbWVudCgpOwotICAgIGlmICgh aW5uZXJUZXh0KQotICAgICAgICByZXR1cm4gMDsKLQotICAgIGlmICghaW5uZXJUZXh0LT5maXJz dENoaWxkKCkpCi0gICAgICAgIHJldHVybiBSYW5nZTo6Y3JlYXRlKGRvY3VtZW50KCksIGlubmVy VGV4dCwgMCwgaW5uZXJUZXh0LCAwKTsKLQotICAgIGludCBvZmZzZXQgPSAwOwotICAgIE5vZGUq IHN0YXJ0Tm9kZSA9IDA7Ci0gICAgTm9kZSogZW5kTm9kZSA9IDA7Ci0gICAgZm9yIChOb2RlKiBu b2RlID0gaW5uZXJUZXh0LT5maXJzdENoaWxkKCk7IG5vZGU7IG5vZGUgPSBub2RlLT50cmF2ZXJz ZU5leHROb2RlKGlubmVyVGV4dCkpIHsKLSAgICAgICAgQVNTRVJUKCFub2RlLT5maXJzdENoaWxk KCkpOwotICAgICAgICBBU1NFUlQobm9kZS0+aXNUZXh0Tm9kZSgpIHx8IG5vZGUtPmhhc1RhZ05h bWUoYnJUYWcpKTsKLSAgICAgICAgaW50IGxlbmd0aCA9IG5vZGUtPmlzVGV4dE5vZGUoKSA/IGxh c3RPZmZzZXRJbk5vZGUobm9kZSkgOiAxOwotCi0gICAgICAgIGlmIChvZmZzZXQgPD0gc3RhcnQg JiYgc3RhcnQgPD0gb2Zmc2V0ICsgbGVuZ3RoKQotICAgICAgICAgICAgc2V0Q29udGFpbmVyQW5k T2Zmc2V0Rm9yUmFuZ2Uobm9kZSwgc3RhcnQgLSBvZmZzZXQsIHN0YXJ0Tm9kZSwgc3RhcnQpOwot Ci0gICAgICAgIGlmIChvZmZzZXQgPD0gZW5kICYmIGVuZCA8PSBvZmZzZXQgKyBsZW5ndGgpIHsK LSAgICAgICAgICAgIHNldENvbnRhaW5lckFuZE9mZnNldEZvclJhbmdlKG5vZGUsIGVuZCAtIG9m ZnNldCwgZW5kTm9kZSwgZW5kKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0KLSAg ICAgICAgb2Zmc2V0ICs9IGxlbmd0aDsKLSAgICB9Ci0KLSAgICBpZiAoIXN0YXJ0Tm9kZSB8fCAh ZW5kTm9kZSkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIHRvUmVuZGVyVGV4dENvbnRy b2wocmVuZGVyZXIoKSktPnNlbGVjdGlvbihtX2NhY2hlZFNlbGVjdGlvblN0YXJ0LCBtX2NhY2hl ZFNlbGVjdGlvbkVuZCk7Cit9CiAKLSAgICByZXR1cm4gUmFuZ2U6OmNyZWF0ZShkb2N1bWVudCgp LCBzdGFydE5vZGUsIHN0YXJ0LCBlbmROb2RlLCBlbmQpOwordm9pZCBIVE1MVGV4dEZvcm1Db250 cm9sRWxlbWVudDo6cmVzdG9yZUNhY2hlZFNlbGVjdGlvbigpCit7CisgICAgV2ViQ29yZTo6c2V0 U2VsZWN0aW9uUmFuZ2UodGhpcywgbV9jYWNoZWRTZWxlY3Rpb25TdGFydCwgbV9jYWNoZWRTZWxl Y3Rpb25FbmQpOwogfQogCiB2b2lkIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50OjpzZWxlY3Rp b25DaGFuZ2VkKGJvb2wgdXNlclRyaWdnZXJlZCkKQEAgLTgxNiw3ICs3MTUsOCBAQCB2b2lkIEhU TUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50OjpzZWxlY3Rpb25DaGFuZ2VkKGJvb2wgdXNlclRyaWdn ZXJlZCkKICAgICBpZiAoIXJlbmRlcmVyKCkgfHwgIWlzVGV4dEZvcm1Db250cm9sKCkpCiAgICAg ICAgIHJldHVybjsKIAotICAgIGNhY2hlU2VsZWN0aW9uKHNlbGVjdGlvblN0YXJ0KCksIHNlbGVj dGlvbkVuZCgpKTsKKyAgICBSZW5kZXJUZXh0Q29udHJvbCogcmVuZGVyVGV4dENvbnRyb2wgPSB0 b1JlbmRlclRleHRDb250cm9sKHJlbmRlcmVyKCkpOworICAgIGNhY2hlU2VsZWN0aW9uKHJlbmRl clRleHRDb250cm9sLT5zZWxlY3Rpb25TdGFydCgpLCByZW5kZXJUZXh0Q29udHJvbC0+c2VsZWN0 aW9uRW5kKCkpOwogCiAgICAgaWYgKEZyYW1lKiBmcmFtZSA9IGRvY3VtZW50KCktPmZyYW1lKCkp IHsKICAgICAgICAgaWYgKGZyYW1lLT5zZWxlY3Rpb24oKS0+aXNSYW5nZSgpICYmIHVzZXJUcmln Z2VyZWQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGb3JtQ29udHJvbEVs ZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZvcm1Db250cm9sRWxlbWVudC5oCmlu ZGV4IGM5ZDBhODc4YTQ2YTkxZTVlZDQ4ZjFhOWZlMTcxMDg0MDdiNDMxNmMuLmI3OTA5NjhhYjU3 YWFhNWY3ZTQzNzM4Zjk1MjRhNTUyYmEzYTkzOGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTEZvcm1Db250cm9sRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTEZvcm1Db250cm9sRWxlbWVudC5oCkBAIC0yMDcsNyArMjA3LDYgQEAgcHVibGljOgogICAg IHZvaWQgc2VsZWN0KCk7CiAgICAgdm9pZCBzZXRTZWxlY3Rpb25SYW5nZShpbnQgc3RhcnQsIGlu dCBlbmQpOwogICAgIFBhc3NSZWZQdHI8UmFuZ2U+IHNlbGVjdGlvbigpIGNvbnN0OwotICAgIFN0 cmluZyBzZWxlY3RlZFRleHQoKSBjb25zdDsKIAogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaEZv cm1Db250cm9sQ2hhbmdlRXZlbnQoKTsKIApAQCAtMjMxLDcgKzIzMCw3IEBAIHByb3RlY3RlZDoK IAogICAgIHZvaWQgc2V0VGV4dEFzT2ZMYXN0Rm9ybUNvbnRyb2xDaGFuZ2VFdmVudChjb25zdCBT dHJpbmcmIHRleHQpIHsgbV90ZXh0QXNPZkxhc3RGb3JtQ29udHJvbENoYW5nZUV2ZW50ID0gdGV4 dDsgfQogCi0gICAgdm9pZCByZXN0b3JlQ2FjaGVkU2VsZWN0aW9uKCkgeyBzZXRTZWxlY3Rpb25S YW5nZShtX2NhY2hlZFNlbGVjdGlvblN0YXJ0LCBtX2NhY2hlZFNlbGVjdGlvbkVuZCk7IH0KKyAg ICB2b2lkIHJlc3RvcmVDYWNoZWRTZWxlY3Rpb24oKTsKICAgICBib29sIGhhc0NhY2hlZFNlbGVj dGlvblN0YXJ0KCkgY29uc3QgeyByZXR1cm4gbV9jYWNoZWRTZWxlY3Rpb25TdGFydCA+PSAwOyB9 CiAgICAgYm9vbCBoYXNDYWNoZWRTZWxlY3Rpb25FbmQoKSBjb25zdCB7IHJldHVybiBtX2NhY2hl ZFNlbGVjdGlvbkVuZCA+PSAwOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTElucHV0RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1l bnQuY3BwCmluZGV4IGFhMWI3NjNmNmQ0OGZmM2MzZTgwMjMxNDhjMTM0ODZkZjU0OTViM2UuLjA5 N2U3ZjNhYzUzNmRjM2JiZmRjM2JjNjc0ZTFmNzgwOTE3ODdhYzYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcApAQCAtMTAxNiw3ICsxMDE2LDcgQEAgdm9pZCBIVE1M SW5wdXRFbGVtZW50OjpzZXRWYWx1ZShjb25zdCBTdHJpbmcmIHZhbHVlLCBib29sIHNlbmRDaGFu Z2VFdmVudCkKICAgICBpZiAoaXNUZXh0RmllbGQoKSkgewogICAgICAgICB1bnNpZ25lZCBtYXgg PSB2aXNpYmxlVmFsdWUoKS5sZW5ndGgoKTsKICAgICAgICAgaWYgKGRvY3VtZW50KCktPmZvY3Vz ZWROb2RlKCkgPT0gdGhpcykKLSAgICAgICAgICAgIHNldFNlbGVjdGlvblJhbmdlKG1heCwgbWF4 KTsKKyAgICAgICAgICAgIFdlYkNvcmU6OnNldFNlbGVjdGlvblJhbmdlKHRoaXMsIG1heCwgbWF4 KTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgY2FjaGVTZWxlY3Rpb24obWF4LCBtYXgpOwog ICAgICAgICBtX3N1Z2dlc3RlZFZhbHVlID0gU3RyaW5nKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmNwcAppbmRleCAzYWU5YTIwNzYxYjg3OGQyMmNi ZDgyZTg5ZTlkYTIzNzY0ZmFkMzQ1Li4zY2E3ODYwZDZmOGJjMWJkOWRkMjg4MGRlMzg0NGQyMDBl YWY0M2YwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENv bnRyb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJv bC5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJFdmVudC5oIgogI2luY2x1ZGUgIkV2 ZW50TmFtZXMuaCIKICNpbmNsdWRlICJGcmFtZS5oIgorI2luY2x1ZGUgIkZyYW1lU2VsZWN0aW9u LmgiCiAjaW5jbHVkZSAiSFRNTEJSRWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxGb3JtQ29udHJv bEVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MSW5wdXRFbGVtZW50LmgiCkBAIC04MSwxMSArODIs NiBAQCBSZW5kZXJUZXh0Q29udHJvbDo6flJlbmRlclRleHRDb250cm9sKCkKIHsKIH0KIAotSFRN TFRleHRGb3JtQ29udHJvbEVsZW1lbnQqIFJlbmRlclRleHRDb250cm9sOjp0ZXh0Rm9ybUNvbnRy b2xFbGVtZW50KCkKLXsKLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8SFRNTFRleHRGb3JtQ29udHJv bEVsZW1lbnQqPihub2RlKCkpOwotfQotCiB2b2lkIFJlbmRlclRleHRDb250cm9sOjpzdHlsZURp ZENoYW5nZShTdHlsZURpZmZlcmVuY2UgZGlmZiwgY29uc3QgUmVuZGVyU3R5bGUqIG9sZFN0eWxl KQogewogICAgIFJlbmRlckJsb2NrOjpzdHlsZURpZENoYW5nZShkaWZmLCBvbGRTdHlsZSk7CkBA IC0xNzcsNiArMTczLDczIEBAIHZvaWQgUmVuZGVyVGV4dENvbnRyb2w6OnNldExhc3RDaGFuZ2VX YXNVc2VyRWRpdChib29sIGxhc3RDaGFuZ2VXYXNVc2VyRWRpdCkKICAgICBkb2N1bWVudCgpLT5z ZXRJZ25vcmVBdXRvZm9jdXMobGFzdENoYW5nZVdhc1VzZXJFZGl0KTsKIH0KIAoraW50IFJlbmRl clRleHRDb250cm9sOjpzZWxlY3Rpb25TdGFydCgpIGNvbnN0Cit7CisgICAgRnJhbWUqIGZyYW1l ID0gdGhpcy0+ZnJhbWUoKTsKKyAgICBpZiAoIWZyYW1lKQorICAgICAgICByZXR1cm4gMDsKKyAg ICAKKyAgICBIVE1MRWxlbWVudCogaW5uZXJUZXh0ID0gaW5uZXJUZXh0RWxlbWVudCgpOworICAg IC8vIERvIG5vdCBjYWxsIGlubmVyVGV4dEVsZW1lbnQoKSBpbiB0aGUgZnVuY3Rpb24gYXJndW1l bnRzIGFzIGNyZWF0aW5nIGEgVmlzaWJsZVBvc2l0aW9uCisgICAgLy8gZnJvbSBmcmFtZS0+c2Vs ZWN0aW9uLT5zdGFydCgpIGNhbiBibG93IHVzIGZyb20gdW5kZXJuZWF0aC4gQWxzbywgZnVuY3Rp b24gb3JkZXJpbmcgaXMKKyAgICAvLyB1c3VhbGx5IGRlcGVuZGVudCBvbiB0aGUgY29tcGlsZXIu CisgICAgcmV0dXJuIFJlbmRlclRleHRDb250cm9sOjppbmRleEZvclZpc2libGVQb3NpdGlvbihp bm5lclRleHQsIGZyYW1lLT5zZWxlY3Rpb24oKS0+c3RhcnQoKSk7Cit9CisKK2ludCBSZW5kZXJU ZXh0Q29udHJvbDo6c2VsZWN0aW9uRW5kKCkgY29uc3QKK3sKKyAgICBGcmFtZSogZnJhbWUgPSB0 aGlzLT5mcmFtZSgpOworICAgIGlmICghZnJhbWUpCisgICAgICAgIHJldHVybiAwOworCisgICAg SFRNTEVsZW1lbnQqIGlubmVyVGV4dCA9IGlubmVyVGV4dEVsZW1lbnQoKTsKKyAgICAvLyBEbyBu b3QgY2FsbCBpbm5lclRleHRFbGVtZW50KCkgaW4gdGhlIGZ1bmN0aW9uIGFyZ3VtZW50cyBhcyBj cmVhdGluZyBhIFZpc2libGVQb3NpdGlvbgorICAgIC8vIGZyb20gZnJhbWUtPnNlbGVjdGlvbi0+ ZW5kKCkgY2FuIGJsb3cgdXMgZnJvbSB1bmRlcm5lYXRoLiBBbHNvLCBmdW5jdGlvbiBvcmRlcmlu ZyBpcworICAgIC8vIHVzdWFsbHkgZGVwZW5kZW50IG9uIHRoZSBjb21waWxlci4KKyAgICByZXR1 cm4gUmVuZGVyVGV4dENvbnRyb2w6OmluZGV4Rm9yVmlzaWJsZVBvc2l0aW9uKGlubmVyVGV4dCwg ZnJhbWUtPnNlbGVjdGlvbigpLT5lbmQoKSk7Cit9CisKK2Jvb2wgUmVuZGVyVGV4dENvbnRyb2w6 Omhhc1Zpc2libGVUZXh0QXJlYSgpIGNvbnN0Cit7CisgICAgSFRNTEVsZW1lbnQqIGlubmVyVGV4 dCA9IGlubmVyVGV4dEVsZW1lbnQoKTsKKyAgICByZXR1cm4gc3R5bGUoKS0+dmlzaWJpbGl0eSgp ID09IEhJRERFTiB8fCAhaW5uZXJUZXh0IHx8ICFpbm5lclRleHQtPnJlbmRlcmVyKCkgfHwgIWlu bmVyVGV4dC0+cmVuZGVyQm94KCktPmhlaWdodCgpOworfQorCit2b2lkIHNldFNlbGVjdGlvblJh bmdlKE5vZGUqIG5vZGUsIGludCBzdGFydCwgaW50IGVuZCkKK3sKKyAgICBBU1NFUlQobm9kZSk7 CisgICAgbm9kZS0+ZG9jdW1lbnQoKS0+dXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0eWxlc2hl ZXRzKCk7CisKKyAgICBpZiAoIW5vZGUtPnJlbmRlcmVyKCkgfHwgIW5vZGUtPnJlbmRlcmVyKCkt PmlzVGV4dENvbnRyb2woKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgZW5kID0gbWF4KGVuZCwg MCk7CisgICAgc3RhcnQgPSBtaW4obWF4KHN0YXJ0LCAwKSwgZW5kKTsKKworICAgIFJlbmRlclRl eHRDb250cm9sKiBjb250cm9sID0gdG9SZW5kZXJUZXh0Q29udHJvbChub2RlLT5yZW5kZXJlcigp KTsKKworICAgIGlmIChjb250cm9sLT5oYXNWaXNpYmxlVGV4dEFyZWEoKSkgeworICAgICAgICBz dGF0aWNfY2FzdDxIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudCo+KG5vZGUpLT5jYWNoZVNlbGVj dGlvbihzdGFydCwgZW5kKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICBWaXNpYmxlUG9z aXRpb24gc3RhcnRQb3NpdGlvbiA9IGNvbnRyb2wtPnZpc2libGVQb3NpdGlvbkZvckluZGV4KHN0 YXJ0KTsKKyAgICBWaXNpYmxlUG9zaXRpb24gZW5kUG9zaXRpb247CisgICAgaWYgKHN0YXJ0ID09 IGVuZCkKKyAgICAgICAgZW5kUG9zaXRpb24gPSBzdGFydFBvc2l0aW9uOworICAgIGVsc2UKKyAg ICAgICAgZW5kUG9zaXRpb24gPSBjb250cm9sLT52aXNpYmxlUG9zaXRpb25Gb3JJbmRleChlbmQp OworCisgICAgLy8gc3RhcnRQb3NpdGlvbiBhbmQgZW5kUG9zaXRpb24gY2FuIGJlIG51bGwgcG9z aXRpb24gZm9yIGV4YW1wbGUgd2hlbgorICAgIC8vICItd2Via2l0LXVzZXItc2VsZWN0OiBub25l IiBzdHlsZSBhdHRyaWJ1dGUgaXMgc3BlY2lmaWVkLgorICAgIGlmIChzdGFydFBvc2l0aW9uLmlz Tm90TnVsbCgpICYmIGVuZFBvc2l0aW9uLmlzTm90TnVsbCgpKSB7CisgICAgICAgIEFTU0VSVChz dGFydFBvc2l0aW9uLmRlZXBFcXVpdmFsZW50KCkuZGVwcmVjYXRlZE5vZGUoKS0+c2hhZG93QW5j ZXN0b3JOb2RlKCkgPT0gbm9kZSAmJiBlbmRQb3NpdGlvbi5kZWVwRXF1aXZhbGVudCgpLmRlcHJl Y2F0ZWROb2RlKCktPnNoYWRvd0FuY2VzdG9yTm9kZSgpID09IG5vZGUpOworICAgIH0KKyAgICBW aXNpYmxlU2VsZWN0aW9uIG5ld1NlbGVjdGlvbiA9IFZpc2libGVTZWxlY3Rpb24oc3RhcnRQb3Np dGlvbiwgZW5kUG9zaXRpb24pOworCisgICAgaWYgKEZyYW1lKiBmcmFtZSA9IG5vZGUtPmRvY3Vt ZW50KCktPmZyYW1lKCkpCisgICAgICAgIGZyYW1lLT5zZWxlY3Rpb24oKS0+c2V0U2VsZWN0aW9u KG5ld1NlbGVjdGlvbik7Cit9CisKIGJvb2wgUmVuZGVyVGV4dENvbnRyb2w6OmlzU2VsZWN0YWJs ZUVsZW1lbnQoSFRNTEVsZW1lbnQqIGlubmVyVGV4dCwgTm9kZSogbm9kZSkKIHsKICAgICBpZiAo IW5vZGUgfHwgIWlubmVyVGV4dCkKQEAgLTE5Myw2ICsyNTYsNTIgQEAgYm9vbCBSZW5kZXJUZXh0 Q29udHJvbDo6aXNTZWxlY3RhYmxlRWxlbWVudChIVE1MRWxlbWVudCogaW5uZXJUZXh0LCBOb2Rl KiBub2RlKQogICAgICAgICB8fCAoc2hhZG93QW5jZXN0b3ItPmhhc1RhZ05hbWUoaW5wdXRUYWcp ICYmIHN0YXRpY19jYXN0PEhUTUxJbnB1dEVsZW1lbnQqPihzaGFkb3dBbmNlc3RvciktPmlzVGV4 dEZpZWxkKCkpKTsKIH0KIAorc3RhdGljIGlubGluZSB2b2lkIHNldENvbnRhaW5lckFuZE9mZnNl dEZvclJhbmdlKE5vZGUqIG5vZGUsIGludCBvZmZzZXQsIE5vZGUqJiBjb250YWluZXJOb2RlLCBp bnQmIG9mZnNldEluQ29udGFpbmVyKQoreworICAgIGlmIChub2RlLT5pc1RleHROb2RlKCkpIHsK KyAgICAgICAgY29udGFpbmVyTm9kZSA9IG5vZGU7CisgICAgICAgIG9mZnNldEluQ29udGFpbmVy ID0gb2Zmc2V0OworICAgIH0gZWxzZSB7CisgICAgICAgIGNvbnRhaW5lck5vZGUgPSBub2RlLT5w YXJlbnROb2RlKCk7CisgICAgICAgIG9mZnNldEluQ29udGFpbmVyID0gbm9kZS0+bm9kZUluZGV4 KCkgKyBvZmZzZXQ7CisgICAgfQorfQorCitQYXNzUmVmUHRyPFJhbmdlPiBSZW5kZXJUZXh0Q29u dHJvbDo6c2VsZWN0aW9uKGludCBzdGFydCwgaW50IGVuZCkgY29uc3QKK3sKKyAgICBBU1NFUlQo c3RhcnQgPD0gZW5kKTsKKyAgICBIVE1MRWxlbWVudCogaW5uZXJUZXh0ID0gaW5uZXJUZXh0RWxl bWVudCgpOworICAgIGlmICghaW5uZXJUZXh0KQorICAgICAgICByZXR1cm4gMDsKKworICAgIGlm ICghaW5uZXJUZXh0LT5maXJzdENoaWxkKCkpCisgICAgICAgIHJldHVybiBSYW5nZTo6Y3JlYXRl KGRvY3VtZW50KCksIGlubmVyVGV4dCwgMCwgaW5uZXJUZXh0LCAwKTsKKworICAgIGludCBvZmZz ZXQgPSAwOworICAgIE5vZGUqIHN0YXJ0Tm9kZSA9IDA7CisgICAgTm9kZSogZW5kTm9kZSA9IDA7 CisgICAgZm9yIChOb2RlKiBub2RlID0gaW5uZXJUZXh0LT5maXJzdENoaWxkKCk7IG5vZGU7IG5v ZGUgPSBub2RlLT50cmF2ZXJzZU5leHROb2RlKGlubmVyVGV4dCkpIHsKKyAgICAgICAgQVNTRVJU KCFub2RlLT5maXJzdENoaWxkKCkpOworICAgICAgICBBU1NFUlQobm9kZS0+aXNUZXh0Tm9kZSgp IHx8IG5vZGUtPmhhc1RhZ05hbWUoYnJUYWcpKTsKKyAgICAgICAgaW50IGxlbmd0aCA9IG5vZGUt PmlzVGV4dE5vZGUoKSA/IGxhc3RPZmZzZXRJbk5vZGUobm9kZSkgOiAxOworICAgIAorICAgICAg ICBpZiAob2Zmc2V0IDw9IHN0YXJ0ICYmIHN0YXJ0IDw9IG9mZnNldCArIGxlbmd0aCkKKyAgICAg ICAgICAgIHNldENvbnRhaW5lckFuZE9mZnNldEZvclJhbmdlKG5vZGUsIHN0YXJ0IC0gb2Zmc2V0 LCBzdGFydE5vZGUsIHN0YXJ0KTsKKworICAgICAgICBpZiAob2Zmc2V0IDw9IGVuZCAmJiBlbmQg PD0gb2Zmc2V0ICsgbGVuZ3RoKSB7CisgICAgICAgICAgICBzZXRDb250YWluZXJBbmRPZmZzZXRG b3JSYW5nZShub2RlLCBlbmQgLSBvZmZzZXQsIGVuZE5vZGUsIGVuZCk7CisgICAgICAgICAgICBi cmVhazsKKyAgICAgICAgfQorCisgICAgICAgIG9mZnNldCArPSBsZW5ndGg7CisgICAgfQorICAg IAorICAgIGlmICghc3RhcnROb2RlIHx8ICFlbmROb2RlKQorICAgICAgICByZXR1cm4gMDsKKwor ICAgIHJldHVybiBSYW5nZTo6Y3JlYXRlKGRvY3VtZW50KCksIHN0YXJ0Tm9kZSwgc3RhcnQsIGVu ZE5vZGUsIGVuZCk7Cit9CisKIFZpc2libGVQb3NpdGlvbiBSZW5kZXJUZXh0Q29udHJvbDo6dmlz aWJsZVBvc2l0aW9uRm9ySW5kZXgoaW50IGluZGV4KSBjb25zdAogewogICAgIGlmIChpbmRleCA8 PSAwKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250 cm9sLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuaAppbmRl eCBjZDBlMWRmOGVkYWQxODU4N2VlY2VmYWZkMmUxMDlhYjU1NmMwMWU4Li44ZGZlMWQyYTRhNTBi ZjQyZDdjZDVlZGQxMWQwMTE1YmFiMzY0ZTEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGV4dENvbnRyb2wuaApAQCAtMjYsNyArMjYsNiBAQAogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKLWNsYXNzIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50OwogY2xhc3MgVmlzaWJs ZVNlbGVjdGlvbjsKIGNsYXNzIFRleHRDb250cm9sSW5uZXJFbGVtZW50OwogY2xhc3MgVGV4dENv bnRyb2xJbm5lclRleHRFbGVtZW50OwpAQCAtMzUsMTMgKzM0LDE2IEBAIGNsYXNzIFJlbmRlclRl eHRDb250cm9sIDogcHVibGljIFJlbmRlckJsb2NrIHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5S ZW5kZXJUZXh0Q29udHJvbCgpOwogCi0gICAgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQqIHRl eHRGb3JtQ29udHJvbEVsZW1lbnQoKTsKICAgICB2aXJ0dWFsIEhUTUxFbGVtZW50KiBpbm5lclRl eHRFbGVtZW50KCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxSZW5kZXJTdHls ZT4gY3JlYXRlSW5uZXJUZXh0U3R5bGUoY29uc3QgUmVuZGVyU3R5bGUqIHN0YXJ0U3R5bGUpIGNv bnN0ID0gMDsKIAogICAgIGJvb2wgbGFzdENoYW5nZVdhc1VzZXJFZGl0KCkgY29uc3QgeyByZXR1 cm4gbV9sYXN0Q2hhbmdlV2FzVXNlckVkaXQ7IH0KICAgICB2b2lkIHNldExhc3RDaGFuZ2VXYXNV c2VyRWRpdChib29sIGxhc3RDaGFuZ2VXYXNVc2VyRWRpdCk7CiAKKyAgICBpbnQgc2VsZWN0aW9u U3RhcnQoKSBjb25zdDsKKyAgICBpbnQgc2VsZWN0aW9uRW5kKCkgY29uc3Q7CisgICAgUGFzc1Jl ZlB0cjxSYW5nZT4gc2VsZWN0aW9uKGludCBzdGFydCwgaW50IGVuZCkgY29uc3Q7CisKICAgICB2 aXJ0dWFsIHZvaWQgc3VidHJlZUhhc0NoYW5nZWQoKTsKICAgICBTdHJpbmcgdGV4dCgpOwogICAg IFN0cmluZyB0ZXh0V2l0aEhhcmRMaW5lQnJlYWtzKCk7CkBAIC05NCw2ICs5Niw3IEBAIHByaXZh dGU6CiAKICAgICB2aXJ0dWFsIGJvb2wgcmVxdWlyZXNGb3JjZWRTdHlsZVJlY2FsY1Byb3BhZ2F0 aW9uKCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogCisgICAgYm9vbCBoYXNWaXNpYmxlVGV4dEFy ZWEoKSBjb25zdDsKICAgICBmcmllbmQgdm9pZCBzZXRTZWxlY3Rpb25SYW5nZShOb2RlKiwgaW50 IHN0YXJ0LCBpbnQgZW5kKTsKICAgICBzdGF0aWMgYm9vbCBpc1NlbGVjdGFibGVFbGVtZW50KEhU TUxFbGVtZW50KiwgTm9kZSopOwogICAgIApAQCAtMTA2LDYgKzEwOSw4IEBAIHByaXZhdGU6CiAg ICAgYm9vbCBtX2xhc3RDaGFuZ2VXYXNVc2VyRWRpdDsKIH07CiAKK3ZvaWQgc2V0U2VsZWN0aW9u UmFuZ2UoTm9kZSosIGludCBzdGFydCwgaW50IGVuZCk7CisKIGlubGluZSBSZW5kZXJUZXh0Q29u dHJvbCogdG9SZW5kZXJUZXh0Q29udHJvbChSZW5kZXJPYmplY3QqIG9iamVjdCkKIHsgCiAgICAg QVNTRVJUKCFvYmplY3QgfHwgb2JqZWN0LT5pc1RleHRDb250cm9sKCkpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9xdC9BcGkv cXdlYnBhZ2UuY3BwCmluZGV4IGM3NTk0M2NiYmZjYWM0MzcxYmQyZTgwMGVmYmQ1ZTBjZmJjNjA0 ODQuLmU4ZThmYmUxNWQ5NDFkMjVlMTc3ZDgwMTNlOGUwZjFkOTVjNGY4YWEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0 L0FwaS9xd2VicGFnZS5jcHAKQEAgLTExMTEsMTAgKzExMTEsOCBAQCB2b2lkIFFXZWJQYWdlUHJp dmF0ZTo6aW5wdXRNZXRob2RFdmVudChRSW5wdXRNZXRob2RFdmVudCAqZXYpCiAgICAgICAgIGNh c2UgUUlucHV0TWV0aG9kRXZlbnQ6OlNlbGVjdGlvbjogewogICAgICAgICAgICAgaGFzU2VsZWN0 aW9uID0gdHJ1ZTsKICAgICAgICAgICAgIC8vIEEgc2VsZWN0aW9uIGluIHRoZSBpbnB1dE1ldGhv ZEV2ZW50IGlzIGFsd2F5cyByZWZsZWN0ZWQgaW4gdGhlIHZpc2libGUgdGV4dAotICAgICAgICAg ICAgaWYgKG5vZGUpIHsKLSAgICAgICAgICAgICAgICBpZiAoSFRNTFRleHRGb3JtQ29udHJvbEVs ZW1lbnQqIHRleHRDb250cm9sID0gdG9UZXh0Rm9ybUNvbnRyb2wobm9kZSkpCi0gICAgICAgICAg ICAgICAgICAgIHRleHRDb250cm9sLT5zZXRTZWxlY3Rpb25SYW5nZShxTWluKGEuc3RhcnQsIChh LnN0YXJ0ICsgYS5sZW5ndGgpKSwgcU1heChhLnN0YXJ0LCAoYS5zdGFydCArIGEubGVuZ3RoKSkp OwotICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKG5vZGUpCisgICAgICAgICAgICAgICAg c2V0U2VsZWN0aW9uUmFuZ2Uobm9kZSwgcU1pbihhLnN0YXJ0LCAoYS5zdGFydCArIGEubGVuZ3Ro KSksIHFNYXgoYS5zdGFydCwgKGEuc3RhcnQgKyBhLmxlbmd0aCkpKTsKIAogICAgICAgICAgICAg aWYgKCFldi0+cHJlZWRpdFN0cmluZygpLmlzRW1wdHkoKSkKICAgICAgICAgICAgICAgICBlZGl0 b3ItPnNldENvbXBvc2l0aW9uKGV2LT5wcmVlZGl0U3RyaW5nKCksIHVuZGVybGluZXMsIHFNaW4o YS5zdGFydCwgKGEuc3RhcnQgKyBhLmxlbmd0aCkpLCBxTWF4KGEuc3RhcnQsIChhLnN0YXJ0ICsg YS5sZW5ndGgpKSk7CkBAIC0xMTM0LDggKzExMzIsNyBAQCB2b2lkIFFXZWJQYWdlUHJpdmF0ZTo6 aW5wdXRNZXRob2RFdmVudChRSW5wdXRNZXRob2RFdmVudCAqZXYpCiAgICAgaWYgKG5vZGUgJiYg ZXYtPnJlcGxhY2VtZW50TGVuZ3RoKCkgPiAwKSB7CiAgICAgICAgIGludCBjdXJzb3JQb3MgPSBm cmFtZS0+c2VsZWN0aW9uKCktPmV4dGVudCgpLm9mZnNldEluQ29udGFpbmVyTm9kZSgpOwogICAg ICAgICBpbnQgc3RhcnQgPSBjdXJzb3JQb3MgKyBldi0+cmVwbGFjZW1lbnRTdGFydCgpOwotICAg ICAgICBpZiAoSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQqIHRleHRDb250cm9sID0gdG9UZXh0 Rm9ybUNvbnRyb2wobm9kZSkpCi0gICAgICAgICAgICB0ZXh0Q29udHJvbC0+c2V0U2VsZWN0aW9u UmFuZ2Uoc3RhcnQsIHN0YXJ0ICsgZXYtPnJlcGxhY2VtZW50TGVuZ3RoKCkpOworICAgICAgICBz ZXRTZWxlY3Rpb25SYW5nZShub2RlLCBzdGFydCwgc3RhcnQgKyBldi0+cmVwbGFjZW1lbnRMZW5n dGgoKSk7CiAgICAgICAgIC8vIENvbW1pdCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgY29tbWl0U3Ry aW5nIGlzIGVtcHR5LCB0byBnZXQgcmlkIG9mIHNlbGVjdGlvbi4KICAgICAgICAgZWRpdG9yLT5j b25maXJtQ29tcG9zaXRpb24oZXYtPmNvbW1pdFN0cmluZygpKTsKICAgICB9IGVsc2UgaWYgKCFl di0+Y29tbWl0U3RyaW5nKCkuaXNFbXB0eSgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L3F0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDk1YmQwZTU0 MzZhYmM1YTVjNTYwNTUzMWVmMTk3NjRlYzIwNGM5NDkuLjNkNjRmMGZmNjQ3MGZmNWE4MDJkZGU5 ZWIzOTY1NDhhNTBlYzVhM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEt MDctMDggIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmll d2VkLCByb2xsaW5nIG91dCByOTA2NjIuCisgICAgICAgIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcv Y2hhbmdlc2V0LzkwNjYyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD02NDIxMgorCisgICAgICAgIENocm9taXVtIGd0ZXN0cyBleHBvc2VkIGEgYnVnIHdo ZXJlIHdlIHJldHVybiB0aGUgZW5kIHZhbHVlCisgICAgICAgIGZvciBzZWxlY3Rpb25TdGFydCAo UmVxdWVzdGVkIGJ5IG9qYW4gb24gI3dlYmtpdCkuCisKKyAgICAgICAgKiBBcGkvcXdlYnBhZ2Uu Y3BwOgorICAgICAgICAoUVdlYlBhZ2VQcml2YXRlOjppbnB1dE1ldGhvZEV2ZW50KToKKwogMjAx MS0wNy0wOCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBNb3Zl IHNlbGVjdGlvbiByZWxhdGVkIGNvZGUgZnJvbSBSZW5kZXJUZXh0Q29udHJvbCB0byBIVE1MVGV4 dEZvcm1Db250cm9sRWxlbWVudAo=