132066 2014-04-23 11:07:19 -0700 REGRESSION (r168046): [New Multicolumn] Selection into and out of column-span elements doesn't work 2014-05-01 14:00:51 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 1003329 0 hyatt 2014-04-23 11:07:19 -0700 Selection across column-spans doesn't work because the render tree is all scrambled up. We need to patch the iteration in RenderView that walks selection subtrees to do the right thing when it encounters the span's placeholder. 1005752 1 230585 hyatt 2014-05-01 09:57:07 -0700 Created attachment 230585 Patch 1005753 2 commit-queue 2014-05-01 09:58:01 -0700 Attachment 230585 did not pass style-queue: ERROR: Source/WebCore/rendering/RenderView.cpp:58: This { should be at the end of the previous line [whitespace/braces] [4] ERROR: Source/WebCore/rendering/RenderView.cpp:62: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebCore/rendering/RenderView.cpp:67: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebCore/rendering/RenderView.cpp:77: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 4 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1005784 3 230596 hyatt 2014-05-01 11:14:58 -0700 Created attachment 230596 Patch pass style queue. 1005785 4 commit-queue 2014-05-01 11:16:12 -0700 Attachment 230596 did not pass style-queue: ERROR: Source/WebCore/rendering/RenderView.cpp:58: This { should be at the end of the previous line [whitespace/braces] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1005788 5 230596 oliver 2014-05-01 11:21:28 -0700 Comment on attachment 230596 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=230596&action=review > Source/WebCore/rendering/RenderView.cpp:59 > + RenderObject* m_current; RenderPtr<RenderObject> please - i dream of having these things not disappearing from beneath us :( Even though the current uses imply no state mutation, i don't like the idea of making an "iterator" that could be accidentally used in a context that leads to mutation 1005793 6 hyatt 2014-05-01 11:40:18 -0700 (In reply to comment #5) > (From update of attachment 230596 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=230596&action=review > > > Source/WebCore/rendering/RenderView.cpp:59 > > + RenderObject* m_current; > > RenderPtr<RenderObject> please - i dream of having these things not disappearing from beneath us :( > > Even though the current uses imply no state mutation, i don't like the idea of making an "iterator" that could be accidentally used in a context that leads to mutation I don't think this is an appropriate place for RenderPtr. This is just a read-only loop of the selected objects. Nothing is mutated. The iterator is confined to the .cpp file, so it's not going to see any weird usage. If this were longer-lasting or designed for re-use I would see your point, but there's no use case for this that would make any sense in the presence of mutation. 1005796 7 230596 oliver 2014-05-01 11:47:12 -0700 Comment on attachment 230596 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=230596&action=review >>> Source/WebCore/rendering/RenderView.cpp:59 >>> + RenderObject* m_current; >> >> RenderPtr<RenderObject> please - i dream of having these things not disappearing from beneath us :( >> >> Even though the current uses imply no state mutation, i don't like the idea of making an "iterator" that could be accidentally used in a context that leads to mutation > > I don't think this is an appropriate place for RenderPtr. This is just a read-only loop of the selected objects. Nothing is mutated. The iterator is confined to the .cpp file, so it's not going to see any weird usage. If this were longer-lasting or designed for re-use I would see your point, but there's no use case for this that would make any sense in the presence of mutation. okie dokie 1005822 8 230596 commit-queue 2014-05-01 13:08:52 -0700 Comment on attachment 230596 Patch Rejecting attachment 230596 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'apply-attachment', '--no-update', '--non-interactive', 230596, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: #5 succeeded at 774 (offset 1 line). Hunk #6 succeeded at 928 (offset 1 line). Hunk #7 succeeded at 946 (offset 1 line). Hunk #8 succeeded at 972 (offset 1 line). Hunk #9 succeeded at 986 (offset 1 line). Hunk #10 succeeded at 1011 (offset 1 line). 1 out of 10 hunks FAILED -- saving rejects to file Source/WebCore/rendering/RenderView.cpp.rej Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Oliver Hunt']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.appspot.com/results/6426956396494848 1005838 9 hyatt 2014-05-01 14:00:51 -0700 Fixed in r168121. 230585 2014-05-01 09:57:07 -0700 2014-05-01 11:14:58 -0700 Patch patch.txt text/plain 7806 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2ODEwNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE0LTA1LTAxICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMTY4MDQ2KTog W05ldyBNdWx0aWNvbHVtbl0gU2VsZWN0aW9uIGludG8gYW5kIG91dCBvZiBjb2x1bW4tc3BhbiBl bGVtZW50cyBkb2Vzbid0IHdvcmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzMjA2NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE1ha2UgYSBuZXcgU2VsZWN0aW9uSXRlcmF0b3Igc3RydWN0IHRoYXQga25v d3MgaG93IHRvIGRyaWxsIGludG8gYW5kIG91dCBvZgorICAgICAgICBjb2x1bW4gc3BhbiBwbGFj ZWhvbGRlcnMuIEFsc28gY2hhbmdlIHNwYW5zIHRvIGJlIHNlbGVjdGlvbiByb290cyAoaW4gdGhl IHBhaW50aW5nCisgICAgICAgIHNlbnNlKS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJC bG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6aXNTZWxlY3Rpb25Sb290 KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpzZWxlY3Rpb25HYXBzKToKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3Rp b25JdGVyYXRvcjo6U2VsZWN0aW9uSXRlcmF0b3IpOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0 aW9uSXRlcmF0b3I6OmNoZWNrRm9yU3Bhbm5lcik6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3Rp b25JdGVyYXRvcjo6Y3VycmVudCk6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3Rpb25JdGVyYXRv cjo6bmV4dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJWaWV3OjpzdWJ0cmVlU2VsZWN0aW9u Qm91bmRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclZpZXc6OnJlcGFpbnRTdWJ0cmVlU2Vs ZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclZpZXc6OnNldFN1YnRyZWVTZWxlY3Rp b24pOgorCiAyMDE0LTA0LTMwICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAg ICAgICAgIFtNU0VdIFNlZWtpbmcgYmV0d2VlbiB0d28gYnVmZmVyZWQgcmFuZ2VzIGVucXV1ZXMg aW5jb3JyZWN0IGJ1ZmZlcnMuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2suY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9jay5jcHAJKHJldmlzaW9uIDE2ODA4NCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIyOTQsNyArMjI5NCw3IEBAIGJvb2wg UmVuZGVyQmxvY2s6OmlzU2VsZWN0aW9uUm9vdCgpIGNvbnMKICAgICAgICAgfHwgaXNQb3NpdGlv bmVkKCkgfHwgaXNGbG9hdGluZygpCiAgICAgICAgIHx8IGlzVGFibGVDZWxsKCkgfHwgaXNJbmxp bmVCbG9ja09ySW5saW5lVGFibGUoKQogICAgICAgICB8fCBoYXNUcmFuc2Zvcm0oKSB8fCBoYXNS ZWZsZWN0aW9uKCkgfHwgaGFzTWFzaygpIHx8IGlzV3JpdGluZ01vZGVSb290KCkKLSAgICAgICAg fHwgaXNSZW5kZXJGbG93VGhyZWFkKCkpCisgICAgICAgIHx8IGlzUmVuZGVyRmxvd1RocmVhZCgp IHx8IHN0eWxlKCkuY29sdW1uU3BhbigpID09IENvbHVtblNwYW5BbGwpCiAgICAgICAgIHJldHVy biB0cnVlOwogICAgIAogICAgIGlmICh2aWV3KCkuc2VsZWN0aW9uU3RhcnQoKSkgewpAQCAtMjQx Myw3ICsyNDEzLDcgQEAgR2FwUmVjdHMgUmVuZGVyQmxvY2s6OnNlbGVjdGlvbkdhcHMoUmVuZAog ICAgIGlmICghaXNSZW5kZXJCbG9ja0Zsb3coKSkgLy8gRklYTUU6IE1ha2UgbXVsdGktY29sdW1u IHNlbGVjdGlvbiBnYXAgZmlsbGluZyB3b3JrIHNvbWVkYXkuCiAgICAgICAgIHJldHVybiByZXN1 bHQ7CiAKLSAgICBpZiAoaGFzQ29sdW1ucygpIHx8IGhhc1RyYW5zZm9ybSgpIHx8IHN0eWxlKCku Y29sdW1uU3BhbigpIHx8IGlzSW5GbG93UmVuZGVyRmxvd1RocmVhZCgpKSB7CisgICAgaWYgKGhh c0NvbHVtbnMoKSB8fCBoYXNUcmFuc2Zvcm0oKSB8fCBzdHlsZSgpLmNvbHVtblNwYW4oKSA9PSBD b2x1bW5TcGFuQWxsIHx8IGlzSW5GbG93UmVuZGVyRmxvd1RocmVhZCgpKSB7CiAgICAgICAgIC8v IEZJWE1FOiBXZSBzaG91bGQgbGVhcm4gaG93IHRvIGdhcCBmaWxsIG11bHRpcGxlIGNvbHVtbnMg YW5kIHRyYW5zZm9ybXMgZXZlbnR1YWxseS4KICAgICAgICAgbGFzdExvZ2ljYWxUb3AgPSBibG9j a0RpcmVjdGlvbk9mZnNldChyb290QmxvY2ssIG9mZnNldEZyb21Sb290QmxvY2spICsgbG9naWNh bEhlaWdodCgpOwogICAgICAgICBsYXN0TG9naWNhbExlZnQgPSBsb2dpY2FsTGVmdFNlbGVjdGlv bk9mZnNldChyb290QmxvY2ssIGxvZ2ljYWxIZWlnaHQoKSwgY2FjaGUpOwpJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAkocmV2aXNpb24gMTY4MDg0KQorKysgU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00 Myw2ICs0Myw3IEBACiAjaW5jbHVkZSAiUmVuZGVyTGF5ZXJCYWNraW5nLmgiCiAjaW5jbHVkZSAi UmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgiCiAjaW5jbHVkZSAiUmVuZGVyTXVsdGlDb2x1bW5GbG93 VGhyZWFkLmgiCisjaW5jbHVkZSAiUmVuZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxhY2Vob2xkZXIu aCIKICNpbmNsdWRlICJSZW5kZXJOYW1lZEZsb3dUaHJlYWQuaCIKICNpbmNsdWRlICJSZW5kZXJT ZWxlY3Rpb25JbmZvLmgiCiAjaW5jbHVkZSAiUmVuZGVyV2lkZ2V0LmgiCkBAIC01Myw2ICs1NCw0 MCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK3N0cnVjdCBTZWxlY3Rpb25JdGVyYXRvcgor eworICAgIFJlbmRlck9iamVjdCogbV9jdXJyZW50OworICAgIFZlY3RvcjxSZW5kZXJNdWx0aUNv bHVtblNwYW5uZXJQbGFjZWhvbGRlcio+IG1fc3Bhbm5lclN0YWNrOworICAgIAorICAgIFNlbGVj dGlvbkl0ZXJhdG9yKFJlbmRlck9iamVjdCogbykgeworICAgICAgICBtX2N1cnJlbnQgPSBvOwor ICAgICAgICBjaGVja0ZvclNwYW5uZXIoKTsKKyAgICB9CisgICAgCisgICAgdm9pZCBjaGVja0Zv clNwYW5uZXIoKSB7CisgICAgICAgIGlmICghbV9jdXJyZW50IHx8ICFtX2N1cnJlbnQtPmlzUmVu ZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxhY2Vob2xkZXIoKSkKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgUmVuZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxhY2Vob2xkZXIqIHBsYWNlaG9sZGVy ID0gdG9SZW5kZXJNdWx0aUNvbHVtblNwYW5uZXJQbGFjZWhvbGRlcihtX2N1cnJlbnQpOworICAg ICAgICBtX3NwYW5uZXJTdGFjay5hcHBlbmQocGxhY2Vob2xkZXIpOworICAgICAgICBtX2N1cnJl bnQgPSBwbGFjZWhvbGRlci0+c3Bhbm5lcigpOworICAgIH0KKyAgICAKKyAgICBSZW5kZXJPYmpl Y3QqIGN1cnJlbnQoKSB7IHJldHVybiBtX2N1cnJlbnQ7IH0KKyAgICAKKyAgICBSZW5kZXJPYmpl Y3QqIG5leHQoKSB7CisgICAgICAgIFJlbmRlck9iamVjdCogY3VycmVudFNwYW4gPSBtX3NwYW5u ZXJTdGFjay5pc0VtcHR5KCkgPyAwIDogbV9zcGFubmVyU3RhY2subGFzdCgpLT5zcGFubmVyKCk7 CisgICAgICAgIG1fY3VycmVudCA9IG1fY3VycmVudC0+bmV4dEluUHJlT3JkZXIoY3VycmVudFNw YW4pOworICAgICAgICBjaGVja0ZvclNwYW5uZXIoKTsKKyAgICAgICAgaWYgKCFtX2N1cnJlbnQg JiYgY3VycmVudFNwYW4pIHsKKyAgICAgICAgICAgIFJlbmRlck9iamVjdCogcGxhY2Vob2xkZXIg PSBtX3NwYW5uZXJTdGFjay5sYXN0KCk7CisgICAgICAgICAgICBtX3NwYW5uZXJTdGFjay5yZW1v dmVMYXN0KCk7CisgICAgICAgICAgICBtX2N1cnJlbnQgPSBwbGFjZWhvbGRlci0+bmV4dEluUHJl T3JkZXIoKTsKKyAgICAgICAgICAgIGNoZWNrRm9yU3Bhbm5lcigpOworICAgICAgICB9CisgICAg ICAgIHJldHVybiBtX2N1cnJlbnQ7CisgICAgfQorfTsKKwogUmVuZGVyVmlldzo6UmVuZGVyVmll dyhEb2N1bWVudCYgZG9jdW1lbnQsIFBhc3NSZWY8UmVuZGVyU3R5bGU+IHN0eWxlKQogICAgIDog UmVuZGVyQmxvY2tGbG93KGRvY3VtZW50LCBzdGQ6Om1vdmUoc3R5bGUpKQogICAgICwgbV9mcmFt ZVZpZXcoKmRvY3VtZW50LnZpZXcoKSkKQEAgLTY4Myw2ICs3MTgsNyBAQCBMYXlvdXRSZWN0IFJl bmRlclZpZXc6OnN1YnRyZWVTZWxlY3Rpb25CCiAKICAgICBSZW5kZXJPYmplY3QqIG9zID0gcm9v dC5zZWxlY3Rpb25TdGFydCgpOwogICAgIFJlbmRlck9iamVjdCogc3RvcCA9IHJlbmRlcmVyQWZ0 ZXJQb3NpdGlvbihyb290LnNlbGVjdGlvbkVuZCgpLCByb290LnNlbGVjdGlvbkVuZFBvcygpKTsK KyAgICBTZWxlY3Rpb25JdGVyYXRvciBzZWxlY3Rpb25JdGVyYXRvcihvcyk7CiAgICAgd2hpbGUg KG9zICYmIG9zICE9IHN0b3ApIHsKICAgICAgICAgaWYgKChvcy0+Y2FuQmVTZWxlY3Rpb25MZWFm KCkgfHwgb3MgPT0gcm9vdC5zZWxlY3Rpb25TdGFydCgpIHx8IG9zID09IHJvb3Quc2VsZWN0aW9u RW5kKCkpICYmIG9zLT5zZWxlY3Rpb25TdGF0ZSgpICE9IFNlbGVjdGlvbk5vbmUpIHsKICAgICAg ICAgICAgIC8vIEJsb2NrcyBhcmUgcmVzcG9uc2libGUgZm9yIHBhaW50aW5nIGxpbmUgZ2FwcyBh bmQgbWFyZ2luIGdhcHMuIFRoZXkgbXVzdCBiZSBleGFtaW5lZCBhcyB3ZWxsLgpAQCAtNjk3LDcg KzczMyw3IEBAIExheW91dFJlY3QgUmVuZGVyVmlldzo6c3VidHJlZVNlbGVjdGlvbkIKICAgICAg ICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIG9zID0gb3MtPm5leHRJblByZU9yZGVyKCk7 CisgICAgICAgIG9zID0gc2VsZWN0aW9uSXRlcmF0b3IubmV4dCgpOwogICAgIH0KIAogICAgIC8v IE5vdyBjcmVhdGUgYSBzaW5nbGUgYm91bmRpbmcgYm94IHJlY3QgdGhhdCBlbmNsb3NlcyB0aGUg d2hvbGUgc2VsZWN0aW9uLgpAQCAtNzMxLDcgKzc2Nyw4IEBAIHZvaWQgUmVuZGVyVmlldzo6cmVw YWludFN1YnRyZWVTZWxlY3Rpb24KICAgICBIYXNoU2V0PFJlbmRlckJsb2NrKj4gcHJvY2Vzc2Vk QmxvY2tzOwogCiAgICAgUmVuZGVyT2JqZWN0KiBlbmQgPSByZW5kZXJlckFmdGVyUG9zaXRpb24o cm9vdC5zZWxlY3Rpb25FbmQoKSwgcm9vdC5zZWxlY3Rpb25FbmRQb3MoKSk7Ci0gICAgZm9yIChS ZW5kZXJPYmplY3QqIG8gPSByb290LnNlbGVjdGlvblN0YXJ0KCk7IG8gJiYgbyAhPSBlbmQ7IG8g PSBvLT5uZXh0SW5QcmVPcmRlcigpKSB7CisgICAgU2VsZWN0aW9uSXRlcmF0b3Igc2VsZWN0aW9u SXRlcmF0b3Iocm9vdC5zZWxlY3Rpb25TdGFydCgpKTsKKyAgICBmb3IgKFJlbmRlck9iamVjdCog byA9IHNlbGVjdGlvbkl0ZXJhdG9yLmN1cnJlbnQoKTsgbyAmJiBvICE9IGVuZDsgbyA9IHNlbGVj dGlvbkl0ZXJhdG9yLm5leHQoKSkgewogICAgICAgICBpZiAoIW8tPmNhbkJlU2VsZWN0aW9uTGVh ZigpICYmIG8gIT0gcm9vdC5zZWxlY3Rpb25TdGFydCgpICYmIG8gIT0gcm9vdC5zZWxlY3Rpb25F bmQoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBpZiAoby0+c2VsZWN0aW9uU3Rh dGUoKSA9PSBTZWxlY3Rpb25Ob25lKQpAQCAtODg0LDYgKzkyMSw3IEBAIHZvaWQgUmVuZGVyVmll dzo6c2V0U3VidHJlZVNlbGVjdGlvbihTZWwKIAogICAgIFJlbmRlck9iamVjdCogb3MgPSByb290 LnNlbGVjdGlvblN0YXJ0KCk7CiAgICAgUmVuZGVyT2JqZWN0KiBzdG9wID0gcmVuZGVyZXJBZnRl clBvc2l0aW9uKHJvb3Quc2VsZWN0aW9uRW5kKCksIHJvb3Quc2VsZWN0aW9uRW5kUG9zKCkpOwor ICAgIFNlbGVjdGlvbkl0ZXJhdG9yIHNlbGVjdGlvbkl0ZXJhdG9yKG9zKTsKICAgICB3aGlsZSAo b3MgJiYgb3MgIT0gc3RvcCkgewogICAgICAgICBpZiAoKG9zLT5jYW5CZVNlbGVjdGlvbkxlYWYo KSB8fCBvcyA9PSByb290LnNlbGVjdGlvblN0YXJ0KCkgfHwgb3MgPT0gcm9vdC5zZWxlY3Rpb25F bmQoKSkKICAgICAgICAgICAgICYmIG9zLT5zZWxlY3Rpb25TdGF0ZSgpICE9IFNlbGVjdGlvbk5v bmUpIHsKQEAgLTkwMSw3ICs5MzksNyBAQCB2b2lkIFJlbmRlclZpZXc6OnNldFN1YnRyZWVTZWxl Y3Rpb24oU2VsCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICBvcyA9IG9zLT5u ZXh0SW5QcmVPcmRlcigpOworICAgICAgICBvcyA9IHNlbGVjdGlvbkl0ZXJhdG9yLm5leHQoKTsK ICAgICB9CiAKICAgICAvLyBOb3cgY2xlYXIgdGhlIHNlbGVjdGlvbi4KQEAgLTkyNywxMSArOTY1 LDEyIEBAIHZvaWQgUmVuZGVyVmlldzo6c2V0U3VidHJlZVNlbGVjdGlvbihTZWwKIAogICAgIFJl bmRlck9iamVjdCogbyA9IHN0YXJ0OwogICAgIHN0b3AgPSByZW5kZXJlckFmdGVyUG9zaXRpb24o ZW5kLCBlbmRQb3MpOwotCisgICAgc2VsZWN0aW9uSXRlcmF0b3IgPSBTZWxlY3Rpb25JdGVyYXRv cihvKTsKKyAgICAKICAgICB3aGlsZSAobyAmJiBvICE9IHN0b3ApIHsKICAgICAgICAgaWYgKG8g IT0gc3RhcnQgJiYgbyAhPSBlbmQgJiYgby0+Y2FuQmVTZWxlY3Rpb25MZWFmKCkpCiAgICAgICAg ICAgICBvLT5zZXRTZWxlY3Rpb25TdGF0ZUlmTmVlZGVkKFNlbGVjdGlvbkluc2lkZSk7Ci0gICAg ICAgIG8gPSBvLT5uZXh0SW5QcmVPcmRlcigpOworICAgICAgICBvID0gc2VsZWN0aW9uSXRlcmF0 b3IubmV4dCgpOwogICAgIH0KIAogICAgIGlmIChibG9ja1JlcGFpbnRNb2RlICE9IFJlcGFpbnRO b3RoaW5nKQpAQCAtOTQwLDYgKzk3OSw3IEBAIHZvaWQgUmVuZGVyVmlldzo6c2V0U3VidHJlZVNl bGVjdGlvbihTZWwKICAgICAvLyBOb3cgdGhhdCB0aGUgc2VsZWN0aW9uIHN0YXRlIGhhcyBiZWVu IHVwZGF0ZWQgZm9yIHRoZSBuZXcgb2JqZWN0cywgd2FsayB0aGVtIGFnYWluIGFuZAogICAgIC8v IHB1dCB0aGVtIGluIHRoZSBuZXcgb2JqZWN0cyBsaXN0LgogICAgIG8gPSBzdGFydDsKKyAgICBz ZWxlY3Rpb25JdGVyYXRvciA9IFNlbGVjdGlvbkl0ZXJhdG9yKG8pOwogICAgIHdoaWxlIChvICYm IG8gIT0gc3RvcCkgewogICAgICAgICBpZiAoKG8tPmNhbkJlU2VsZWN0aW9uTGVhZigpIHx8IG8g PT0gc3RhcnQgfHwgbyA9PSBlbmQpICYmIG8tPnNlbGVjdGlvblN0YXRlKCkgIT0gU2VsZWN0aW9u Tm9uZSkgewogICAgICAgICAgICAgc3RkOjp1bmlxdWVfcHRyPFJlbmRlclNlbGVjdGlvbkluZm8+ IHNlbGVjdGlvbkluZm8gPSBzdGQ6Om1ha2VfdW5pcXVlPFJlbmRlclNlbGVjdGlvbkluZm8+KG8s IHRydWUpOwpAQCAtOTY0LDcgKzEwMDQsNyBAQCB2b2lkIFJlbmRlclZpZXc6OnNldFN1YnRyZWVT ZWxlY3Rpb24oU2VsCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICBvID0gby0+ bmV4dEluUHJlT3JkZXIoKTsKKyAgICAgICAgbyA9IHNlbGVjdGlvbkl0ZXJhdG9yLm5leHQoKTsK ICAgICB9CiAKICAgICBpZiAoYmxvY2tSZXBhaW50TW9kZSA9PSBSZXBhaW50Tm90aGluZykK 230596 2014-05-01 11:14:58 -0700 2014-05-01 13:08:52 -0700 Patch patch.txt text/plain 7840 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2ODEwNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE0LTA1LTAxICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMTY4MDQ2KTog W05ldyBNdWx0aWNvbHVtbl0gU2VsZWN0aW9uIGludG8gYW5kIG91dCBvZiBjb2x1bW4tc3BhbiBl bGVtZW50cyBkb2Vzbid0IHdvcmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzMjA2NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE1ha2UgYSBuZXcgU2VsZWN0aW9uSXRlcmF0b3Igc3RydWN0IHRoYXQga25v d3MgaG93IHRvIGRyaWxsIGludG8gYW5kIG91dCBvZgorICAgICAgICBjb2x1bW4gc3BhbiBwbGFj ZWhvbGRlcnMuIEFsc28gY2hhbmdlIHNwYW5zIHRvIGJlIHNlbGVjdGlvbiByb290cyAoaW4gdGhl IHBhaW50aW5nCisgICAgICAgIHNlbnNlKS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJC bG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6aXNTZWxlY3Rpb25Sb290 KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpzZWxlY3Rpb25HYXBzKToKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3Rp b25JdGVyYXRvcjo6U2VsZWN0aW9uSXRlcmF0b3IpOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0 aW9uSXRlcmF0b3I6OmNoZWNrRm9yU3Bhbm5lcik6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3Rp b25JdGVyYXRvcjo6Y3VycmVudCk6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3Rpb25JdGVyYXRv cjo6bmV4dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJWaWV3OjpzdWJ0cmVlU2VsZWN0aW9u Qm91bmRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclZpZXc6OnJlcGFpbnRTdWJ0cmVlU2Vs ZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclZpZXc6OnNldFN1YnRyZWVTZWxlY3Rp b24pOgorCiAyMDE0LTA0LTMwICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAg ICAgICAgIFtNU0VdIFNlZWtpbmcgYmV0d2VlbiB0d28gYnVmZmVyZWQgcmFuZ2VzIGVucXV1ZXMg aW5jb3JyZWN0IGJ1ZmZlcnMuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2suY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9jay5jcHAJKHJldmlzaW9uIDE2ODA4NCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIyOTQsNyArMjI5NCw3IEBAIGJvb2wg UmVuZGVyQmxvY2s6OmlzU2VsZWN0aW9uUm9vdCgpIGNvbnMKICAgICAgICAgfHwgaXNQb3NpdGlv bmVkKCkgfHwgaXNGbG9hdGluZygpCiAgICAgICAgIHx8IGlzVGFibGVDZWxsKCkgfHwgaXNJbmxp bmVCbG9ja09ySW5saW5lVGFibGUoKQogICAgICAgICB8fCBoYXNUcmFuc2Zvcm0oKSB8fCBoYXNS ZWZsZWN0aW9uKCkgfHwgaGFzTWFzaygpIHx8IGlzV3JpdGluZ01vZGVSb290KCkKLSAgICAgICAg fHwgaXNSZW5kZXJGbG93VGhyZWFkKCkpCisgICAgICAgIHx8IGlzUmVuZGVyRmxvd1RocmVhZCgp IHx8IHN0eWxlKCkuY29sdW1uU3BhbigpID09IENvbHVtblNwYW5BbGwpCiAgICAgICAgIHJldHVy biB0cnVlOwogICAgIAogICAgIGlmICh2aWV3KCkuc2VsZWN0aW9uU3RhcnQoKSkgewpAQCAtMjQx Myw3ICsyNDEzLDcgQEAgR2FwUmVjdHMgUmVuZGVyQmxvY2s6OnNlbGVjdGlvbkdhcHMoUmVuZAog ICAgIGlmICghaXNSZW5kZXJCbG9ja0Zsb3coKSkgLy8gRklYTUU6IE1ha2UgbXVsdGktY29sdW1u IHNlbGVjdGlvbiBnYXAgZmlsbGluZyB3b3JrIHNvbWVkYXkuCiAgICAgICAgIHJldHVybiByZXN1 bHQ7CiAKLSAgICBpZiAoaGFzQ29sdW1ucygpIHx8IGhhc1RyYW5zZm9ybSgpIHx8IHN0eWxlKCku Y29sdW1uU3BhbigpIHx8IGlzSW5GbG93UmVuZGVyRmxvd1RocmVhZCgpKSB7CisgICAgaWYgKGhh c0NvbHVtbnMoKSB8fCBoYXNUcmFuc2Zvcm0oKSB8fCBzdHlsZSgpLmNvbHVtblNwYW4oKSA9PSBD b2x1bW5TcGFuQWxsIHx8IGlzSW5GbG93UmVuZGVyRmxvd1RocmVhZCgpKSB7CiAgICAgICAgIC8v IEZJWE1FOiBXZSBzaG91bGQgbGVhcm4gaG93IHRvIGdhcCBmaWxsIG11bHRpcGxlIGNvbHVtbnMg YW5kIHRyYW5zZm9ybXMgZXZlbnR1YWxseS4KICAgICAgICAgbGFzdExvZ2ljYWxUb3AgPSBibG9j a0RpcmVjdGlvbk9mZnNldChyb290QmxvY2ssIG9mZnNldEZyb21Sb290QmxvY2spICsgbG9naWNh bEhlaWdodCgpOwogICAgICAgICBsYXN0TG9naWNhbExlZnQgPSBsb2dpY2FsTGVmdFNlbGVjdGlv bk9mZnNldChyb290QmxvY2ssIGxvZ2ljYWxIZWlnaHQoKSwgY2FjaGUpOwpJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAkocmV2aXNpb24gMTY4MDg0KQorKysgU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00 Myw2ICs0Myw3IEBACiAjaW5jbHVkZSAiUmVuZGVyTGF5ZXJCYWNraW5nLmgiCiAjaW5jbHVkZSAi UmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgiCiAjaW5jbHVkZSAiUmVuZGVyTXVsdGlDb2x1bW5GbG93 VGhyZWFkLmgiCisjaW5jbHVkZSAiUmVuZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxhY2Vob2xkZXIu aCIKICNpbmNsdWRlICJSZW5kZXJOYW1lZEZsb3dUaHJlYWQuaCIKICNpbmNsdWRlICJSZW5kZXJT ZWxlY3Rpb25JbmZvLmgiCiAjaW5jbHVkZSAiUmVuZGVyV2lkZ2V0LmgiCkBAIC01Myw2ICs1NCw0 NiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK3N0cnVjdCBTZWxlY3Rpb25JdGVyYXRvcgor eworICAgIFJlbmRlck9iamVjdCogbV9jdXJyZW50OworICAgIFZlY3RvcjxSZW5kZXJNdWx0aUNv bHVtblNwYW5uZXJQbGFjZWhvbGRlcio+IG1fc3Bhbm5lclN0YWNrOworICAgIAorICAgIFNlbGVj dGlvbkl0ZXJhdG9yKFJlbmRlck9iamVjdCogbykKKyAgICB7CisgICAgICAgIG1fY3VycmVudCA9 IG87CisgICAgICAgIGNoZWNrRm9yU3Bhbm5lcigpOworICAgIH0KKyAgICAKKyAgICB2b2lkIGNo ZWNrRm9yU3Bhbm5lcigpCisgICAgeworICAgICAgICBpZiAoIW1fY3VycmVudCB8fCAhbV9jdXJy ZW50LT5pc1JlbmRlck11bHRpQ29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyKCkpCisgICAgICAgICAg ICByZXR1cm47CisgICAgICAgIFJlbmRlck11bHRpQ29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyKiBw bGFjZWhvbGRlciA9IHRvUmVuZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxhY2Vob2xkZXIobV9jdXJy ZW50KTsKKyAgICAgICAgbV9zcGFubmVyU3RhY2suYXBwZW5kKHBsYWNlaG9sZGVyKTsKKyAgICAg ICAgbV9jdXJyZW50ID0gcGxhY2Vob2xkZXItPnNwYW5uZXIoKTsKKyAgICB9CisgICAgCisgICAg UmVuZGVyT2JqZWN0KiBjdXJyZW50KCkKKyAgICB7CisgICAgICAgIHJldHVybiBtX2N1cnJlbnQ7 CisgICAgfQorICAgIAorICAgIFJlbmRlck9iamVjdCogbmV4dCgpCisgICAgeworICAgICAgICBS ZW5kZXJPYmplY3QqIGN1cnJlbnRTcGFuID0gbV9zcGFubmVyU3RhY2suaXNFbXB0eSgpID8gMCA6 IG1fc3Bhbm5lclN0YWNrLmxhc3QoKS0+c3Bhbm5lcigpOworICAgICAgICBtX2N1cnJlbnQgPSBt X2N1cnJlbnQtPm5leHRJblByZU9yZGVyKGN1cnJlbnRTcGFuKTsKKyAgICAgICAgY2hlY2tGb3JT cGFubmVyKCk7CisgICAgICAgIGlmICghbV9jdXJyZW50ICYmIGN1cnJlbnRTcGFuKSB7CisgICAg ICAgICAgICBSZW5kZXJPYmplY3QqIHBsYWNlaG9sZGVyID0gbV9zcGFubmVyU3RhY2subGFzdCgp OworICAgICAgICAgICAgbV9zcGFubmVyU3RhY2sucmVtb3ZlTGFzdCgpOworICAgICAgICAgICAg bV9jdXJyZW50ID0gcGxhY2Vob2xkZXItPm5leHRJblByZU9yZGVyKCk7CisgICAgICAgICAgICBj aGVja0ZvclNwYW5uZXIoKTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gbV9jdXJyZW50Owor ICAgIH0KK307CisKIFJlbmRlclZpZXc6OlJlbmRlclZpZXcoRG9jdW1lbnQmIGRvY3VtZW50LCBQ YXNzUmVmPFJlbmRlclN0eWxlPiBzdHlsZSkKICAgICA6IFJlbmRlckJsb2NrRmxvdyhkb2N1bWVu dCwgc3RkOjptb3ZlKHN0eWxlKSkKICAgICAsIG1fZnJhbWVWaWV3KCpkb2N1bWVudC52aWV3KCkp CkBAIC02ODMsNiArNzI0LDcgQEAgTGF5b3V0UmVjdCBSZW5kZXJWaWV3OjpzdWJ0cmVlU2VsZWN0 aW9uQgogCiAgICAgUmVuZGVyT2JqZWN0KiBvcyA9IHJvb3Quc2VsZWN0aW9uU3RhcnQoKTsKICAg ICBSZW5kZXJPYmplY3QqIHN0b3AgPSByZW5kZXJlckFmdGVyUG9zaXRpb24ocm9vdC5zZWxlY3Rp b25FbmQoKSwgcm9vdC5zZWxlY3Rpb25FbmRQb3MoKSk7CisgICAgU2VsZWN0aW9uSXRlcmF0b3Ig c2VsZWN0aW9uSXRlcmF0b3Iob3MpOwogICAgIHdoaWxlIChvcyAmJiBvcyAhPSBzdG9wKSB7CiAg ICAgICAgIGlmICgob3MtPmNhbkJlU2VsZWN0aW9uTGVhZigpIHx8IG9zID09IHJvb3Quc2VsZWN0 aW9uU3RhcnQoKSB8fCBvcyA9PSByb290LnNlbGVjdGlvbkVuZCgpKSAmJiBvcy0+c2VsZWN0aW9u U3RhdGUoKSAhPSBTZWxlY3Rpb25Ob25lKSB7CiAgICAgICAgICAgICAvLyBCbG9ja3MgYXJlIHJl c3BvbnNpYmxlIGZvciBwYWludGluZyBsaW5lIGdhcHMgYW5kIG1hcmdpbiBnYXBzLiBUaGV5IG11 c3QgYmUgZXhhbWluZWQgYXMgd2VsbC4KQEAgLTY5Nyw3ICs3MzksNyBAQCBMYXlvdXRSZWN0IFJl bmRlclZpZXc6OnN1YnRyZWVTZWxlY3Rpb25CCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAot ICAgICAgICBvcyA9IG9zLT5uZXh0SW5QcmVPcmRlcigpOworICAgICAgICBvcyA9IHNlbGVjdGlv bkl0ZXJhdG9yLm5leHQoKTsKICAgICB9CiAKICAgICAvLyBOb3cgY3JlYXRlIGEgc2luZ2xlIGJv dW5kaW5nIGJveCByZWN0IHRoYXQgZW5jbG9zZXMgdGhlIHdob2xlIHNlbGVjdGlvbi4KQEAgLTcz MSw3ICs3NzMsOCBAQCB2b2lkIFJlbmRlclZpZXc6OnJlcGFpbnRTdWJ0cmVlU2VsZWN0aW9uCiAg ICAgSGFzaFNldDxSZW5kZXJCbG9jayo+IHByb2Nlc3NlZEJsb2NrczsKIAogICAgIFJlbmRlck9i amVjdCogZW5kID0gcmVuZGVyZXJBZnRlclBvc2l0aW9uKHJvb3Quc2VsZWN0aW9uRW5kKCksIHJv b3Quc2VsZWN0aW9uRW5kUG9zKCkpOwotICAgIGZvciAoUmVuZGVyT2JqZWN0KiBvID0gcm9vdC5z ZWxlY3Rpb25TdGFydCgpOyBvICYmIG8gIT0gZW5kOyBvID0gby0+bmV4dEluUHJlT3JkZXIoKSkg eworICAgIFNlbGVjdGlvbkl0ZXJhdG9yIHNlbGVjdGlvbkl0ZXJhdG9yKHJvb3Quc2VsZWN0aW9u U3RhcnQoKSk7CisgICAgZm9yIChSZW5kZXJPYmplY3QqIG8gPSBzZWxlY3Rpb25JdGVyYXRvci5j dXJyZW50KCk7IG8gJiYgbyAhPSBlbmQ7IG8gPSBzZWxlY3Rpb25JdGVyYXRvci5uZXh0KCkpIHsK ICAgICAgICAgaWYgKCFvLT5jYW5CZVNlbGVjdGlvbkxlYWYoKSAmJiBvICE9IHJvb3Quc2VsZWN0 aW9uU3RhcnQoKSAmJiBvICE9IHJvb3Quc2VsZWN0aW9uRW5kKCkpCiAgICAgICAgICAgICBjb250 aW51ZTsKICAgICAgICAgaWYgKG8tPnNlbGVjdGlvblN0YXRlKCkgPT0gU2VsZWN0aW9uTm9uZSkK QEAgLTg4NCw2ICs5MjcsNyBAQCB2b2lkIFJlbmRlclZpZXc6OnNldFN1YnRyZWVTZWxlY3Rpb24o U2VsCiAKICAgICBSZW5kZXJPYmplY3QqIG9zID0gcm9vdC5zZWxlY3Rpb25TdGFydCgpOwogICAg IFJlbmRlck9iamVjdCogc3RvcCA9IHJlbmRlcmVyQWZ0ZXJQb3NpdGlvbihyb290LnNlbGVjdGlv bkVuZCgpLCByb290LnNlbGVjdGlvbkVuZFBvcygpKTsKKyAgICBTZWxlY3Rpb25JdGVyYXRvciBz ZWxlY3Rpb25JdGVyYXRvcihvcyk7CiAgICAgd2hpbGUgKG9zICYmIG9zICE9IHN0b3ApIHsKICAg ICAgICAgaWYgKChvcy0+Y2FuQmVTZWxlY3Rpb25MZWFmKCkgfHwgb3MgPT0gcm9vdC5zZWxlY3Rp b25TdGFydCgpIHx8IG9zID09IHJvb3Quc2VsZWN0aW9uRW5kKCkpCiAgICAgICAgICAgICAmJiBv cy0+c2VsZWN0aW9uU3RhdGUoKSAhPSBTZWxlY3Rpb25Ob25lKSB7CkBAIC05MDEsNyArOTQ1LDcg QEAgdm9pZCBSZW5kZXJWaWV3OjpzZXRTdWJ0cmVlU2VsZWN0aW9uKFNlbAogICAgICAgICAgICAg fQogICAgICAgICB9CiAKLSAgICAgICAgb3MgPSBvcy0+bmV4dEluUHJlT3JkZXIoKTsKKyAgICAg ICAgb3MgPSBzZWxlY3Rpb25JdGVyYXRvci5uZXh0KCk7CiAgICAgfQogCiAgICAgLy8gTm93IGNs ZWFyIHRoZSBzZWxlY3Rpb24uCkBAIC05MjcsMTEgKzk3MSwxMiBAQCB2b2lkIFJlbmRlclZpZXc6 OnNldFN1YnRyZWVTZWxlY3Rpb24oU2VsCiAKICAgICBSZW5kZXJPYmplY3QqIG8gPSBzdGFydDsK ICAgICBzdG9wID0gcmVuZGVyZXJBZnRlclBvc2l0aW9uKGVuZCwgZW5kUG9zKTsKLQorICAgIHNl bGVjdGlvbkl0ZXJhdG9yID0gU2VsZWN0aW9uSXRlcmF0b3Iobyk7CisgICAgCiAgICAgd2hpbGUg KG8gJiYgbyAhPSBzdG9wKSB7CiAgICAgICAgIGlmIChvICE9IHN0YXJ0ICYmIG8gIT0gZW5kICYm IG8tPmNhbkJlU2VsZWN0aW9uTGVhZigpKQogICAgICAgICAgICAgby0+c2V0U2VsZWN0aW9uU3Rh dGVJZk5lZWRlZChTZWxlY3Rpb25JbnNpZGUpOwotICAgICAgICBvID0gby0+bmV4dEluUHJlT3Jk ZXIoKTsKKyAgICAgICAgbyA9IHNlbGVjdGlvbkl0ZXJhdG9yLm5leHQoKTsKICAgICB9CiAKICAg ICBpZiAoYmxvY2tSZXBhaW50TW9kZSAhPSBSZXBhaW50Tm90aGluZykKQEAgLTk0MCw2ICs5ODUs NyBAQCB2b2lkIFJlbmRlclZpZXc6OnNldFN1YnRyZWVTZWxlY3Rpb24oU2VsCiAgICAgLy8gTm93 IHRoYXQgdGhlIHNlbGVjdGlvbiBzdGF0ZSBoYXMgYmVlbiB1cGRhdGVkIGZvciB0aGUgbmV3IG9i amVjdHMsIHdhbGsgdGhlbSBhZ2FpbiBhbmQKICAgICAvLyBwdXQgdGhlbSBpbiB0aGUgbmV3IG9i amVjdHMgbGlzdC4KICAgICBvID0gc3RhcnQ7CisgICAgc2VsZWN0aW9uSXRlcmF0b3IgPSBTZWxl Y3Rpb25JdGVyYXRvcihvKTsKICAgICB3aGlsZSAobyAmJiBvICE9IHN0b3ApIHsKICAgICAgICAg aWYgKChvLT5jYW5CZVNlbGVjdGlvbkxlYWYoKSB8fCBvID09IHN0YXJ0IHx8IG8gPT0gZW5kKSAm JiBvLT5zZWxlY3Rpb25TdGF0ZSgpICE9IFNlbGVjdGlvbk5vbmUpIHsKICAgICAgICAgICAgIHN0 ZDo6dW5pcXVlX3B0cjxSZW5kZXJTZWxlY3Rpb25JbmZvPiBzZWxlY3Rpb25JbmZvID0gc3RkOjpt YWtlX3VuaXF1ZTxSZW5kZXJTZWxlY3Rpb25JbmZvPihvLCB0cnVlKTsKQEAgLTk2NCw3ICsxMDEw LDcgQEAgdm9pZCBSZW5kZXJWaWV3OjpzZXRTdWJ0cmVlU2VsZWN0aW9uKFNlbAogICAgICAgICAg ICAgfQogICAgICAgICB9CiAKLSAgICAgICAgbyA9IG8tPm5leHRJblByZU9yZGVyKCk7CisgICAg ICAgIG8gPSBzZWxlY3Rpb25JdGVyYXRvci5uZXh0KCk7CiAgICAgfQogCiAgICAgaWYgKGJsb2Nr UmVwYWludE1vZGUgPT0gUmVwYWludE5vdGhpbmcpCg==