99622 2012-10-17 11:37:22 -0700 Clean up Vector.h 2012-10-17 15:51:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca benjamin dglazkov japhet kling peter+ews webkit.review.bot oldest_to_newest 744459 0 andersca 2012-10-17 11:37:22 -0700 Clean up Vector.h 744467 1 169227 andersca 2012-10-17 11:43:51 -0700 Created attachment 169227 Patch 744474 2 169227 benjamin 2012-10-17 11:57:08 -0700 Comment on attachment 169227 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169227&action=review > Source/WTF/WTF.xcodeproj/project.pbxproj:1183 > + 1A6BB769162F300500DD16DB /* StreamBuffer.h in Headers */, The build section should be sorted alphabetically. The MemoryInstrumentationFooBar and WTFURL files are in the wrong place. 744482 3 169227 kling 2012-10-17 12:03:04 -0700 Comment on attachment 169227 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169227&action=review > Source/WTF/WTF.xcodeproj/project.pbxproj:1183 > + 1A6BB769162F300500DD16DB /* StreamBuffer.h in Headers */, The build section should be sorted alphabetically. The MemoryInstrumentationFooBar and WTFURL files are in the wrong place. 744484 4 andersca 2012-10-17 12:04:44 -0700 (In reply to comment #3) > (From update of attachment 169227 [details] [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=169227&action=review > > > Source/WTF/WTF.xcodeproj/project.pbxproj:1183 > > + 1A6BB769162F300500DD16DB /* StreamBuffer.h in Headers */, > > The build section should be sorted alphabetically. The MemoryInstrumentationFooBar and WTFURL files are in the wrong place. They are sorted alphabetically in Xcode. Not sure why the project file is different. 744489 5 benjamin 2012-10-17 12:08:35 -0700 > They are sorted alphabetically in Xcode. Not sure why the project file is different. There are two sections. The file section, which is the one you see on the Project Navigator, and a build section, that is buried deep in the project settings (Project->Targets->Build phases->Copy Headers && Compile Source). It is just unfortunate the build section is not sorted by default. 744495 6 169227 buildbot 2012-10-17 12:25:01 -0700 Comment on attachment 169227 Patch Attachment 169227 did not pass win-ews (win): Output: http://queues.webkit.org/results/14391661 744500 7 169227 webkit.review.bot 2012-10-17 12:32:05 -0700 Comment on attachment 169227 Patch Attachment 169227 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/14392680 744530 8 169227 buildbot 2012-10-17 13:04:27 -0700 Comment on attachment 169227 Patch Attachment 169227 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/14390649 744580 9 169227 gyuyoung.kim 2012-10-17 13:54:49 -0700 Comment on attachment 169227 Patch Attachment 169227 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/14424203 744594 10 169227 peter+ews 2012-10-17 14:03:03 -0700 Comment on attachment 169227 Patch Attachment 169227 did not pass cr-android-ews (chromium-android): Output: http://queues.webkit.org/results/14412232 744620 11 169263 andersca 2012-10-17 14:32:40 -0700 Created attachment 169263 Patch 744627 12 169263 benjamin 2012-10-17 14:37:45 -0700 Comment on attachment 169263 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169263&action=review > Source/WTF/WTF.xcodeproj/project.pbxproj:1184 > F3FBC71E161AF7BF00BB4BD4 /* MemoryInstrumentationHashCountedSet.h in Headers */, > F3FBC720161AF7CD00BB4BD4 /* MemoryInstrumentationSequence.h in Headers */, > + 1A6BB769162F300500DD16DB /* StreamBuffer.h in Headers */, > ); Uh? :( 744631 13 andersca 2012-10-17 14:40:45 -0700 (In reply to comment #12) > (From update of attachment 169263 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=169263&action=review > > > Source/WTF/WTF.xcodeproj/project.pbxproj:1184 > > F3FBC71E161AF7BF00BB4BD4 /* MemoryInstrumentationHashCountedSet.h in Headers */, > > F3FBC720161AF7CD00BB4BD4 /* MemoryInstrumentationSequence.h in Headers */, > > + 1A6BB769162F300500DD16DB /* StreamBuffer.h in Headers */, > > ); > > Uh? :( It's explained in the ChangeLog. 744674 14 andersca 2012-10-17 15:05:55 -0700 (In reply to comment #5) > > They are sorted alphabetically in Xcode. Not sure why the project file is different. > > There are two sections. > The file section, which is the one you see on the Project Navigator, and a build section, that is buried deep in the project settings (Project->Targets->Build phases->Copy Headers && Compile Source). > > It is just unfortunate the build section is not sorted by default. Ah. Makes sense. I went ahead and sorted all files in the project. I'll update the ChangeLog to reflect this. 744726 15 andersca 2012-10-17 15:51:11 -0700 Committed r131659: <http://trac.webkit.org/changeset/131659> 169227 2012-10-17 11:43:51 -0700 2012-10-17 14:32:37 -0700 Patch bug-99622-20121017114238.patch text/plain 21119 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 NmM5YzEzNzIyZTE1NWM4OTJlMGRhMjA3NjE5MTRlZGE2MzBkNDEwLi40MDkxY2U0ZTQ5OGZhZGVh Y2MwOWVlYTI2MDRmOGYxODE0Nzc3ZDQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxMi0xMC0xNyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgorCisgICAgICAgIENsZWFuIHVwIFZlY3Rvci5oCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTYyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBmYWxsb3V0IGZyb20gcmVtb3Zpbmcgc3RkOjpt YXggYW5kIHN0ZDo6bWluIHVzaW5nIGRlY2xhcmF0aW9ucy4KKworICAgICAgICAqIHJ1bnRpbWUv U3RyaW5nUHJvdG90eXBlLmNwcDoKKyAgICAgICAgKEpTQzo6anNTcGxpY2VTdWJzdHJpbmdzKToK KyAgICAgICAgKEpTQzo6anNTcGxpY2VTdWJzdHJpbmdzV2l0aFNlcGFyYXRvcnMpOgorICAgICAg ICAoSlNDOjpzdHJpbmdQcm90b0Z1bmNJbmRleE9mKToKKyAgICAgICAgKiB5YXJyL1lhcnJQYXR0 ZXJuLmNwcDoKKyAgICAgICAgKEpTQzo6WWFycjo6WWFyclBhdHRlcm5Db25zdHJ1Y3Rvcjo6c2V0 dXBEaXNqdW5jdGlvbk9mZnNldHMpOgorCiAyMDEyLTEwLTE3ICBNYXJrIEhhaG5lbmJlcmcgIDxt aGFobmVuYmVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQmxvY2sgZnJlZWluZyB0aHJlYWQgc2hv dWxkIHNsZWVwIGluZGVmaW5pdGVseSB3aGVuIHRoZXJlJ3Mgbm8gd29yayB0byBkbwpkaWZmIC0t Z2l0IGEvU291cmNlL1dURi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwppbmRleCBj NzkwYzg0Mzk1MDkzMWY1OGUwYzg2NWMyZWIwYWEzZDdhOTJmYjFmLi42ODRmYThhZDlkNTc1ODQz NWMyZDJiYmI3NDMxZDlmOTBhOGE5NWNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDEyLTEwLTE3 ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQ2xlYW4g dXAgVmVjdG9yLmgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTk5NjIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgUmVtb3ZlIHVudXNlZCBtZW1iZXIgZnVuY3Rpb25zIGZyb20gVmVjdG9yIGFuZCBnZXQgcmlk IG9mIHRoZSBzdGQ6Om1heCBhbmQgc3RkOjptaW4gdXNpbmcgZGVjbGFyYXRpb25zCisgICAgICAg IChhcyBwZXIgdGhlIFdlYktpdCBjb2Rpbmcgc3R5bGUgZ3VpZGVsaW5lcykuCisKKyAgICAgICAg KiBXVEYueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgVHVybnMgb3V0IFN0cmVh bUJ1ZmZlci5oIHdhcyBuZXZlciBhZGRlZCB0byB0aGUgWGNvZGUgcHJvamVjdC4KKworICAgICAg ICAqIHd0Zi9EZXF1ZS5oOgorICAgICAgICAoV1RGOjo6OmV4cGFuZENhcGFjaXR5KToKKyAgICAg ICAgKiB3dGYvU3RyZWFtQnVmZmVyLmg6CisgICAgICAgIChXVEY6OlN0cmVhbUJ1ZmZlcjo6YXBw ZW5kKToKKyAgICAgICAgQWRkIHN0ZDo6IHByZWZpeGVzIHRvIG1heCBhbmQgbWluLgorCisgICAg ICAgICogd3RmL1ZlY3Rvci5oOgorICAgICAgICBSZW1vdmUgVmVjdG9yQmFzZTo6YnVmZmVyU2xv dCgpLCBWZWN0b3JSZXZlcnNlUHJveHkgYW5kIGFkZCBzdGQ6OiBwcmVmaXhlcyB3aGVyZSBuZWVk ZWQuCisKKzIwMTItMTAtMTcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4K KwogICAgICAgICBBbHdheXMgdXNlIGZhc3RSZWFsbG9jIHdoZW4gZ3Jvd2luZyBvciBzaHJpbmtp bmcgdGhlIFZlY3RvciBidWZmZXIKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTk5NjE2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1MDU2MTNhYzE1MmIxN2YyNzdmMzQy NmYxMTQ5YTQzMzA4MjJkY2FjLi5iM2FhMGRhMjI3MzVjNjc5YTM1YzdkZjc1YjA5YjY2MzdkNzg1 NTE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMTAtMTcgIEFuZGVycyBDYXJs c3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbiB1cCBWZWN0b3IuaAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTk2MjIKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggZmFsbG91 dCBmcm9tIHJlbW92aW5nIHN0ZDo6bWF4IGFuZCBzdGQ6Om1pbiB1c2luZyBkZWNsYXJhdGlvbnMu CisKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2U6OmN1cnJlbnRBZ2UpOgorCiAyMDEyLTEwLTE3ICBBbmRy ZWFzIEtsaW5nICA8a2xpbmdAd2Via2l0Lm9yZz4KIAogICAgICAgICBTaHJpbmsgRXZlbnRUYXJn ZXREYXRhIGJ5IG1ha2luZyBmaXJpbmdFdmVudExpc3RlbmVycyB2ZWN0b3Igb3B0aW9uYWwuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJpbmdQcm90b3R5cGUu Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RyaW5nUHJvdG90eXBlLmNwcApp bmRleCAxNTQwMTc3YmVkNDNiNzI5MDA1ZTVkM2E4ZmRhZWUyZDE5MDYyZTRhLi45ZGNhNDEwNzdm NmM2MzFkMTNlZmNjOThlYjI1ZGQ2YTkzNWE4YWZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9TdHJpbmdQcm90b3R5cGUuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL1N0cmluZ1Byb3RvdHlwZS5jcHAKQEAgLTI4MCw3ICsyODAsNyBAQCBz dGF0aWMgQUxXQVlTX0lOTElORSBKU1ZhbHVlIGpzU3BsaWNlU3Vic3RyaW5ncyhFeGVjU3RhdGUq IGV4ZWMsIEpTU3RyaW5nKiBzb3VyYwogICAgICAgICBpZiAocG9zaXRpb24gPD0gMCAmJiBsZW5n dGggPj0gc291cmNlU2l6ZSkKICAgICAgICAgICAgIHJldHVybiBzb3VyY2VWYWw7CiAgICAgICAg IC8vIFdlIGNvdWxkIGNhbGwgU3RyaW5nOjpzdWJzdHJpbmdTaGFyaW5nSW1wbCgpLCBidXQgdGhp cyB3b3VsZCByZXN1bHQgaW4gcmVkdW5kYW50IGNoZWNrcy4KLSAgICAgICAgcmV0dXJuIGpzU3Ry aW5nKGV4ZWMsIFN0cmluZ0ltcGw6OmNyZWF0ZShzb3VyY2UuaW1wbCgpLCBtYXgoMCwgcG9zaXRp b24pLCBtaW4oc291cmNlU2l6ZSwgbGVuZ3RoKSkpOworICAgICAgICByZXR1cm4ganNTdHJpbmco ZXhlYywgU3RyaW5nSW1wbDo6Y3JlYXRlKHNvdXJjZS5pbXBsKCksIHN0ZDo6bWF4KDAsIHBvc2l0 aW9uKSwgc3RkOjptaW4oc291cmNlU2l6ZSwgbGVuZ3RoKSkpOwogICAgIH0KIAogICAgIGludCB0 b3RhbExlbmd0aCA9IDA7CkBAIC0zMzUsNyArMzM1LDcgQEAgc3RhdGljIEFMV0FZU19JTkxJTkUg SlNWYWx1ZSBqc1NwbGljZVN1YnN0cmluZ3NXaXRoU2VwYXJhdG9ycyhFeGVjU3RhdGUqIGV4ZWMs IEoKICAgICAgICAgaWYgKHBvc2l0aW9uIDw9IDAgJiYgbGVuZ3RoID49IHNvdXJjZVNpemUpCiAg ICAgICAgICAgICByZXR1cm4gc291cmNlVmFsOwogICAgICAgICAvLyBXZSBjb3VsZCBjYWxsIFN0 cmluZzo6c3Vic3RyaW5nU2hhcmluZ0ltcGwoKSwgYnV0IHRoaXMgd291bGQgcmVzdWx0IGluIHJl ZHVuZGFudCBjaGVja3MuCi0gICAgICAgIHJldHVybiBqc1N0cmluZyhleGVjLCBTdHJpbmdJbXBs OjpjcmVhdGUoc291cmNlLmltcGwoKSwgbWF4KDAsIHBvc2l0aW9uKSwgbWluKHNvdXJjZVNpemUs IGxlbmd0aCkpKTsKKyAgICAgICAgcmV0dXJuIGpzU3RyaW5nKGV4ZWMsIFN0cmluZ0ltcGw6OmNy ZWF0ZShzb3VyY2UuaW1wbCgpLCBzdGQ6Om1heCgwLCBwb3NpdGlvbiksIHN0ZDo6bWluKHNvdXJj ZVNpemUsIGxlbmd0aCkpKTsKICAgICB9CiAKICAgICBpbnQgdG90YWxMZW5ndGggPSAwOwpAQCAt MzU5LDcgKzM1OSw3IEBAIHN0YXRpYyBBTFdBWVNfSU5MSU5FIEpTVmFsdWUganNTcGxpY2VTdWJz dHJpbmdzV2l0aFNlcGFyYXRvcnMoRXhlY1N0YXRlKiBleGVjLCBKCiAgICAgICAgIGlmICghaW1w bCkKICAgICAgICAgICAgIHJldHVybiB0aHJvd091dE9mTWVtb3J5RXJyb3IoZXhlYyk7CiAKLSAg ICAgICAgaW50IG1heENvdW50ID0gbWF4KHJhbmdlQ291bnQsIHNlcGFyYXRvckNvdW50KTsKKyAg ICAgICAgaW50IG1heENvdW50ID0gc3RkOjptYXgocmFuZ2VDb3VudCwgc2VwYXJhdG9yQ291bnQp OwogICAgICAgICBpbnQgYnVmZmVyUG9zID0gMDsKICAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkg PCBtYXhDb3VudDsgaSsrKSB7CiAgICAgICAgICAgICBpZiAoaSA8IHJhbmdlQ291bnQpIHsKQEAg LTM4NCw3ICszODQsNyBAQCBzdGF0aWMgQUxXQVlTX0lOTElORSBKU1ZhbHVlIGpzU3BsaWNlU3Vi c3RyaW5nc1dpdGhTZXBhcmF0b3JzKEV4ZWNTdGF0ZSogZXhlYywgSgogICAgIGlmICghaW1wbCkK ICAgICAgICAgcmV0dXJuIHRocm93T3V0T2ZNZW1vcnlFcnJvcihleGVjKTsKIAotICAgIGludCBt YXhDb3VudCA9IG1heChyYW5nZUNvdW50LCBzZXBhcmF0b3JDb3VudCk7CisgICAgaW50IG1heENv dW50ID0gc3RkOjptYXgocmFuZ2VDb3VudCwgc2VwYXJhdG9yQ291bnQpOwogICAgIGludCBidWZm ZXJQb3MgPSAwOwogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbWF4Q291bnQ7IGkrKykgewogICAg ICAgICBpZiAoaSA8IHJhbmdlQ291bnQpIHsKQEAgLTc2Nyw3ICs3NjcsNyBAQCBFbmNvZGVkSlNW YWx1ZSBKU0NfSE9TVF9DQUxMIHN0cmluZ1Byb3RvRnVuY0luZGV4T2YoRXhlY1N0YXRlKiBleGVj KQogICAgICAgICB1bnNpZ25lZCBwb3M7CiAgICAgICAgIGludCBsZW4gPSBzLmxlbmd0aCgpOwog ICAgICAgICBpZiAoYTEuaXNVSW50MzIoKSkKLSAgICAgICAgICAgIHBvcyA9IG1pbjx1aW50MzJf dD4oYTEuYXNVSW50MzIoKSwgbGVuKTsKKyAgICAgICAgICAgIHBvcyA9IHN0ZDo6bWluPHVpbnQz Ml90PihhMS5hc1VJbnQzMigpLCBsZW4pOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIGRv dWJsZSBkcG9zID0gYTEudG9JbnRlZ2VyKGV4ZWMpOwogICAgICAgICAgICAgaWYgKGRwb3MgPCAw KQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyclBhdHRlcm4uY3Bw IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyclBhdHRlcm4uY3BwCmluZGV4IDUwODA5 MjlmNGE0MTlkZjIwMzQ0ODI2NTZlN2RlMmI5OTUzYjQ2OWEuLmM5NTNhMzhkMmY0ZjFhZTJlMzE3 NWFjMTZlZmJkM2M2ZmYxZDlkZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95 YXJyL1lhcnJQYXR0ZXJuLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJy UGF0dGVybi5jcHAKQEAgLTY1Nyw4ICs2NTcsOCBAQCBwdWJsaWM6CiAgICAgICAgIGZvciAodW5z aWduZWQgYWx0ID0gMDsgYWx0IDwgZGlzanVuY3Rpb24tPm1fYWx0ZXJuYXRpdmVzLnNpemUoKTsg KythbHQpIHsKICAgICAgICAgICAgIFBhdHRlcm5BbHRlcm5hdGl2ZSogYWx0ZXJuYXRpdmUgPSBk aXNqdW5jdGlvbi0+bV9hbHRlcm5hdGl2ZXNbYWx0XTsKICAgICAgICAgICAgIHVuc2lnbmVkIGN1 cnJlbnRBbHRlcm5hdGl2ZUNhbGxGcmFtZVNpemUgPSBzZXR1cEFsdGVybmF0aXZlT2Zmc2V0cyhh bHRlcm5hdGl2ZSwgaW5pdGlhbENhbGxGcmFtZVNpemUsIGluaXRpYWxJbnB1dFBvc2l0aW9uKTsK LSAgICAgICAgICAgIG1pbmltdW1JbnB1dFNpemUgPSBtaW4obWluaW11bUlucHV0U2l6ZSwgYWx0 ZXJuYXRpdmUtPm1fbWluaW11bVNpemUpOwotICAgICAgICAgICAgbWF4aW11bUNhbGxGcmFtZVNp emUgPSBtYXgobWF4aW11bUNhbGxGcmFtZVNpemUsIGN1cnJlbnRBbHRlcm5hdGl2ZUNhbGxGcmFt ZVNpemUpOworICAgICAgICAgICAgbWluaW11bUlucHV0U2l6ZSA9IHN0ZDo6bWluKG1pbmltdW1J bnB1dFNpemUsIGFsdGVybmF0aXZlLT5tX21pbmltdW1TaXplKTsKKyAgICAgICAgICAgIG1heGlt dW1DYWxsRnJhbWVTaXplID0gc3RkOjptYXgobWF4aW11bUNhbGxGcmFtZVNpemUsIGN1cnJlbnRB bHRlcm5hdGl2ZUNhbGxGcmFtZVNpemUpOwogICAgICAgICAgICAgaGFzRml4ZWRTaXplICY9IGFs dGVybmF0aXZlLT5tX2hhc0ZpeGVkU2l6ZTsKICAgICAgICAgfQogICAgICAgICAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XVEYvV1RGLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV1RG L1dURi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IGI4YWE1M2JlNGM5MjlhYzk3ZTdl ZTJhZGUyMmIwZDA2NjhkMzJjY2IuLjFmMTYwMjQ2ZThjY2QxNzkyMDdlN2Q5YzgzZmMxMTA2MWQ4 YTA4ZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvV1RGLnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2oKKysrIGIvU291cmNlL1dURi9XVEYueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtMTEs NiArMTEsNyBAQAogCQkxNDNGNjExRjE1NjVGMEY5MDBEQjUxNEEgLyogUkFNU2l6ZS5jcHAgaW4g U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxNDNGNjExRDE1NjVG MEY5MDBEQjUxNEEgLyogUkFNU2l6ZS5jcHAgKi87IH07CiAJCTE0M0Y2MTIwMTU2NUYwRjkwMERC NTE0QSAvKiBSQU1TaXplLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSAxNDNGNjExRTE1NjVGMEY5MDBEQjUxNEEgLyogUkFNU2l6ZS5oICovOyBzZXR0aW5n cyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTE0RjNCMEY3MTVFNDVFNDYw MDIxMDA2OSAvKiBTYXR1cmF0ZWRBcml0aG1ldGljLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxNEYzQjBGNjE1RTQ1RTQ2MDAyMTAwNjkgLyogU2F0dXJh dGVkQXJpdGhtZXRpYy5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7 IH07IH07CisJCTFBNkJCNzY5MTYyRjMwMDUwMEREMTZEQiAvKiBTdHJlYW1CdWZmZXIuaCBpbiBI ZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBNkJCNzY4MTYyRjMw MDUwMEREMTZEQiAvKiBTdHJlYW1CdWZmZXIuaCAqLzsgfTsKIAkJMjYxNDdCMEExNUREQ0NEQzAw RERCOTA3IC8qIEludGVnZXJUb1N0cmluZ0NvbnZlcnNpb24uaCBpbiBIZWFkZXJzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDI2MTQ3QjA4MTVERENDREMwMEREQjkwNyAvKiBJ bnRlZ2VyVG9TdHJpbmdDb252ZXJzaW9uLmggKi87IH07CiAJCTI2NjExMjJFMTYwRkVBRDQwMDEz RjVDMyAvKiBVUkxRdWVyeUNoYXJzZXRDb252ZXJ0ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDI2NjExMjJEMTYwRkVBRDQwMDEzRjVDMyAvKiBVUkxR dWVyeUNoYXJzZXRDb252ZXJ0ZXIuaCAqLzsgfTsKIAkJMjZFNkMxRUUxNjA5MDM3MzAwQ0E2QUY0 IC8qIFVSTENhbm9uRXRjLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDI2RTZDMUNFMTYwOTAzNzMwMENBNkFGNCAvKiBVUkxDYW5vbkV0Yy5jcHAgKi87 IH07CkBAIC02OCw3ICs2OSw2IEBACiAJCUE4QTQ3MzhGMTUxQTgyNUIwMDQxMjNGRiAvKiBCbG9v bUZpbHRlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g QThBNDcyNjUxNTFBODI1QTAwNDEyM0ZGIC8qIEJsb29tRmlsdGVyLmggKi87IH07CiAJCUE4QTQ3 MzkwMTUxQTgyNUIwMDQxMjNGRiAvKiBCb3VuZHNDaGVja2VkUG9pbnRlci5oIGluIEhlYWRlcnMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQThBNDcyNjYxNTFBODI1QTAwNDEy M0ZGIC8qIEJvdW5kc0NoZWNrZWRQb2ludGVyLmggKi87IH07CiAJCUE4QTQ3MzkxMTUxQTgyNUIw MDQxMjNGRiAvKiBCdW1wUG9pbnRlckFsbG9jYXRvci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQThBNDcyNjcxNTFBODI1QTAwNDEyM0ZGIC8qIEJ1bXBQ b2ludGVyQWxsb2NhdG9yLmggKi87IH07Ci0JCUVCOTVFMUYwMTYxQTcyNDEwMDg5QTJGNSAvKiBC eXRlT3JkZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IEVCOTVFMUVGMTYxQTcyNDEwMDg5QTJGNSAvKiBCeXRlT3JkZXIuaCAqLzsgfTsKIAkJQThBNDcz OTQxNTFBODI1QjAwNDEyM0ZGIC8qIENoZWNrZWRBcml0aG1ldGljLmggaW4gSGVhZGVycyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBOEE0NzI2QTE1MUE4MjVBMDA0MTIzRkYg LyogQ2hlY2tlZEFyaXRobWV0aWMuaCAqLzsgfTsKIAkJQThBNDczOTUxNTFBODI1QjAwNDEyM0ZG IC8qIENoZWNrZWRCb29sZWFuLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSBBOEE0NzI2QjE1MUE4MjVBMDA0MTIzRkYgLyogQ2hlY2tlZEJvb2xlYW4uaCAq LzsgfTsKIAkJQThBNDczOTgxNTFBODI1QjAwNDEyM0ZGIC8qIENvbXBpbGVyLmggaW4gSGVhZGVy cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBOEE0NzI3MDE1MUE4MjVBMDA0 MTIzRkYgLyogQ29tcGlsZXIuaCAqLzsgfTsKQEAgLTI3OCw2ICsyNzgsNyBAQAogCQlBOEE0NzQ4 QzE1MUE4MjY0MDA0MTIzRkYgLyogY29uZmlnLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSBBOEE0NzQ4QjE1MUE4MjY0MDA0MTIzRkYgLyogY29uZmlnLmgg Ki87IH07CiAJCUNENTQ5N0FDMTU4NTdEMDMwMEI1QkMzMCAvKiBNZWRpYVRpbWUuY3BwIGluIFNv dXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQ0Q1NDk3QUExNTg1N0Qw MzAwQjVCQzMwIC8qIE1lZGlhVGltZS5jcHAgKi87IH07CiAJCUNENTQ5N0FEMTU4NTdEMDMwMEI1 QkMzMCAvKiBNZWRpYVRpbWUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IENENTQ5N0FCMTU4NTdEMDMwMEI1QkMzMCAvKiBNZWRpYVRpbWUuaCAqLzsgfTsK KwkJRUI5NUUxRjAxNjFBNzI0MTAwODlBMkY1IC8qIEJ5dGVPcmRlci5oIGluIEhlYWRlcnMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRUI5NUUxRUYxNjFBNzI0MTAwODlBMkY1 IC8qIEJ5dGVPcmRlci5oICovOyB9OwogCQlGMzUyNUU0NjE2MTlBNEVFMDAyNzhCQzEgLyogTWVt b3J5SW5zdHJ1bWVudGF0aW9uSGFzaE1hcC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gRjM1MjVFNDUxNjE5QTRFRTAwMjc4QkMxIC8qIE1lbW9yeUluc3Ry dW1lbnRhdGlvbkhhc2hNYXAuaCAqLzsgfTsKIAkJRjNGQkM3MUUxNjFBRjdCRjAwQkI0QkQ0IC8q IE1lbW9yeUluc3RydW1lbnRhdGlvbkhhc2hDb3VudGVkU2V0LmggaW4gSGVhZGVycyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGM0ZCQzcxRDE2MUFGN0JGMDBCQjRCRDQgLyog TWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaENvdW50ZWRTZXQuaCAqLzsgfTsKIAkJRjNGQkM3MjAx NjFBRjdDRDAwQkI0QkQ0IC8qIE1lbW9yeUluc3RydW1lbnRhdGlvblNlcXVlbmNlLmggaW4gSGVh ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGM0ZCQzcxRjE2MUFGN0NE MDBCQjRCRDQgLyogTWVtb3J5SW5zdHJ1bWVudGF0aW9uU2VxdWVuY2UuaCAqLzsgfTsKQEAgLTI4 OCw2ICsyODksNyBAQAogCQkxNDNGNjExRDE1NjVGMEY5MDBEQjUxNEEgLyogUkFNU2l6ZS5jcHAg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBSQU1TaXplLmNwcDsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMTQzRjYxMUUxNTY1RjBGOTAwREI1MTRBIC8qIFJBTVNp emUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gUkFNU2l6ZS5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQkxNEYzQjBGNjE1RTQ1RTQ2MDAyMTAwNjkgLyogU2F0dXJh dGVkQXJpdGhtZXRpYy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBTYXR1cmF0 ZWRBcml0aG1ldGljLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTFBNkJCNzY4MTYy RjMwMDUwMEREMTZEQiAvKiBTdHJlYW1CdWZmZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gU3RyZWFtQnVmZmVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTI2 MTQ3QjA4MTVERENDREMwMEREQjkwNyAvKiBJbnRlZ2VyVG9TdHJpbmdDb252ZXJzaW9uLmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEludGVnZXJUb1N0cmluZ0NvbnZlcnNpb24u aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMjY2MTEyMkQxNjBGRUFENDAwMTNGNUMz IC8qIFVSTFF1ZXJ5Q2hhcnNldENvbnZlcnRlci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7 IHBhdGggPSBVUkxRdWVyeUNoYXJzZXRDb252ZXJ0ZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJMjZFNkMxQ0UxNjA5MDM3MzAwQ0E2QUY0IC8qIFVSTENhbm9uRXRjLmNwcCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFVSTENhbm9uRXRjLmNwcDsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTM1MSw3ICszNTMsNiBAQAogCQlBOEE0NzI2NTE1MUE4 MjVBMDA0MTIzRkYgLyogQmxvb21GaWx0ZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw YXRoID0gQmxvb21GaWx0ZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQThBNDcy NjYxNTFBODI1QTAwNDEyM0ZGIC8qIEJvdW5kc0NoZWNrZWRQb2ludGVyLmggKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEJvdW5kc0NoZWNrZWRQb2ludGVyLmg7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCUE4QTQ3MjY3MTUxQTgyNUEwMDQxMjNGRiAvKiBCdW1wUG9pbnRl ckFsbG9jYXRvci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBCdW1wUG9pbnRl ckFsbG9jYXRvci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwotCQlFQjk1RTFFRjE2MUE3 MjQxMDA4OUEyRjUgLyogQnl0ZU9yZGVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0 aCA9IEJ5dGVPcmRlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlBOEE0NzI2QTE1 MUE4MjVBMDA0MTIzRkYgLyogQ2hlY2tlZEFyaXRobWV0aWMuaCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuYy5oOyBwYXRoID0gQ2hlY2tlZEFyaXRobWV0aWMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJQThBNDcyNkIxNTFBODI1QTAwNDEyM0ZGIC8qIENoZWNrZWRCb29sZWFuLmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IENoZWNrZWRCb29sZWFuLmg7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCUE4QTQ3MjcwMTUxQTgyNUEwMDQxMjNGRiAvKiBDb21waWxl ci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBDb21waWxlci5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwpAQCAtNTY0LDYgKzU2NSw3IEBACiAJCUE4QTQ3NDhCMTUxQTgy NjQwMDQxMjNGRiAvKiBjb25maWcuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0g Y29uZmlnLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUNENTQ5N0FBMTU4NTdEMDMw MEI1QkMzMCAvKiBNZWRpYVRpbWUuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBw YXRoID0gTWVkaWFUaW1lLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQ0Q1NDk3 QUIxNTg1N0QwMzAwQjVCQzMwIC8qIE1lZGlhVGltZS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j Lmg7IHBhdGggPSBNZWRpYVRpbWUuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJRUI5 NUUxRUYxNjFBNzI0MTAwODlBMkY1IC8qIEJ5dGVPcmRlci5oICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jLmg7IHBhdGggPSBCeXRlT3JkZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ RjM1MjVFNDUxNjE5QTRFRTAwMjc4QkMxIC8qIE1lbW9yeUluc3RydW1lbnRhdGlvbkhhc2hNYXAu aCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gTWVtb3J5SW5zdHJ1bWVudGF0aW9u SGFzaE1hcC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlGM0ZCQzcxRDE2MUFGN0JG MDBCQjRCRDQgLyogTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaENvdW50ZWRTZXQuaCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaENvdW50 ZWRTZXQuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJRjNGQkM3MUYxNjFBRjdDRDAw QkI0QkQ0IC8qIE1lbW9yeUluc3RydW1lbnRhdGlvblNlcXVlbmNlLmggKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmMuaDsgcGF0aCA9IE1lbW9yeUluc3RydW1lbnRhdGlvblNlcXVlbmNlLmg7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC03NzgsNiArNzgwLDcgQEAKIAkJCQlBOEE0NzMwRjE1 MUE4MjVCMDA0MTIzRkYgLyogU3RhY2tCb3VuZHMuaCAqLywKIAkJCQlBOEE0NzMxMDE1MUE4MjVC MDA0MTIzRkYgLyogU3RhdGljQ29uc3RydWN0b3JzLmggKi8sCiAJCQkJQThBNDczMTExNTFBODI1 QjAwNDEyM0ZGIC8qIFN0ZExpYkV4dHJhcy5oICovLAorCQkJCTFBNkJCNzY4MTYyRjMwMDUwMERE MTZEQiAvKiBTdHJlYW1CdWZmZXIuaCAqLywKIAkJCQlBOEE0NzMxMjE1MUE4MjVCMDA0MTIzRkYg LyogU3RyaW5nRXh0cmFzLmNwcCAqLywKIAkJCQlBOEE0NzMxMzE1MUE4MjVCMDA0MTIzRkYgLyog U3RyaW5nRXh0cmFzLmggKi8sCiAJCQkJQThBNDczMTQxNTFBODI1QjAwNDEyM0ZGIC8qIFN0cmlu Z0hhc2hlci5oICovLApAQCAtMTE3Nyw2ICsxMTgwLDcgQEAKIAkJCQk0RkQyQTM1OTE2MUIwRUUx MDBFQkYyMzYgLyogTWVtb3J5SW5zdHJ1bWVudGF0aW9uUGFyc2VkVVJMLmggaW4gSGVhZGVycyAq LywKIAkJCQlGM0ZCQzcxRTE2MUFGN0JGMDBCQjRCRDQgLyogTWVtb3J5SW5zdHJ1bWVudGF0aW9u SGFzaENvdW50ZWRTZXQuaCBpbiBIZWFkZXJzICovLAogCQkJCUYzRkJDNzIwMTYxQUY3Q0QwMEJC NEJENCAvKiBNZW1vcnlJbnN0cnVtZW50YXRpb25TZXF1ZW5jZS5oIGluIEhlYWRlcnMgKi8sCisJ CQkJMUE2QkI3NjkxNjJGMzAwNTAwREQxNkRCIC8qIFN0cmVhbUJ1ZmZlci5oIGluIEhlYWRlcnMg Ki8sCiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CiAJ CX07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9EZXF1ZS5oIGIvU291cmNlL1dURi93dGYv RGVxdWUuaAppbmRleCA0N2MwZGZmZmEzYjhkY2Q3ODU1OGE2M2NjYmJkYmExMzIyODJjNGU4Li5i ZTY5YzgxZGIzYzhlNDgzZGJhNGUwOWE1NjU0NTAzNjg3ZTNlYzgxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV1RGL3d0Zi9EZXF1ZS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL0RlcXVlLmgKQEAgLTQyNiw3 ICs0MjYsNyBAQCBuYW1lc3BhY2UgV1RGIHsKICAgICB7CiAgICAgICAgIGNoZWNrVmFsaWRpdHko KTsKICAgICAgICAgc2l6ZV90IG9sZENhcGFjaXR5ID0gbV9idWZmZXIuY2FwYWNpdHkoKTsKLSAg ICAgICAgc2l6ZV90IG5ld0NhcGFjaXR5ID0gbWF4KHN0YXRpY19jYXN0PHNpemVfdD4oMTYpLCBv bGRDYXBhY2l0eSArIG9sZENhcGFjaXR5IC8gNCArIDEpOworICAgICAgICBzaXplX3QgbmV3Q2Fw YWNpdHkgPSBzdGQ6Om1heChzdGF0aWNfY2FzdDxzaXplX3Q+KDE2KSwgb2xkQ2FwYWNpdHkgKyBv bGRDYXBhY2l0eSAvIDQgKyAxKTsKICAgICAgICAgVCogb2xkQnVmZmVyID0gbV9idWZmZXIuYnVm ZmVyKCk7CiAgICAgICAgIG1fYnVmZmVyLmFsbG9jYXRlQnVmZmVyKG5ld0NhcGFjaXR5KTsKICAg ICAgICAgaWYgKG1fc3RhcnQgPD0gbV9lbmQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9T dHJlYW1CdWZmZXIuaCBiL1NvdXJjZS9XVEYvd3RmL1N0cmVhbUJ1ZmZlci5oCmluZGV4IGFkZDI1 NDlkNmNhZWQ5ODgxNzJmYTc2OGRhNGMzMzIzMzc2MzY2NjQuLmU3ZDk1OGY2OWMzMmZjOTI1MWZj ZTFhMDNhM2Q5ZjNjZWJkZTYzZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1N0cmVhbUJ1 ZmZlci5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL1N0cmVhbUJ1ZmZlci5oCkBAIC02Myw3ICs2Myw3 IEBAIHB1YmxpYzoKICAgICAgICAgd2hpbGUgKHNpemUpIHsKICAgICAgICAgICAgIGlmICghbV9i dWZmZXIuc2l6ZSgpIHx8IG1fYnVmZmVyLmxhc3QoKS0+c2l6ZSgpID09IEJsb2NrU2l6ZSkKICAg ICAgICAgICAgICAgICBtX2J1ZmZlci5hcHBlbmQoYWRvcHRQdHIobmV3IEJsb2NrKSk7Ci0gICAg ICAgICAgICBzaXplX3QgYXBwZW5kU2l6ZSA9IG1pbihCbG9ja1NpemUgLSBtX2J1ZmZlci5sYXN0 KCktPnNpemUoKSwgc2l6ZSk7CisgICAgICAgICAgICBzaXplX3QgYXBwZW5kU2l6ZSA9IHN0ZDo6 bWluKEJsb2NrU2l6ZSAtIG1fYnVmZmVyLmxhc3QoKS0+c2l6ZSgpLCBzaXplKTsKICAgICAgICAg ICAgIG1fYnVmZmVyLmxhc3QoKS0+YXBwZW5kKGRhdGEsIGFwcGVuZFNpemUpOwogICAgICAgICAg ICAgZGF0YSArPSBhcHBlbmRTaXplOwogICAgICAgICAgICAgc2l6ZSAtPSBhcHBlbmRTaXplOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvVmVjdG9yLmggYi9Tb3VyY2UvV1RGL3d0Zi9WZWN0 b3IuaAppbmRleCAwYmM1NmY4NDEwZWU4MjY2MjFkN2E4MDQxNGUyYTM2ZmE1MGNjMGNjLi5kMmRl ZGVmZWE4ZjkxYmYwOWZmMGZmNDhhN2JkNTgzZmY3NDY5NGU1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V1RGL3d0Zi9WZWN0b3IuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9WZWN0b3IuaApAQCAtMzQsOSAr MzQsNiBAQAogCiBuYW1lc3BhY2UgV1RGIHsKIAotICAgIHVzaW5nIHN0ZDo6bWluOwotICAgIHVz aW5nIHN0ZDo6bWF4OwotCiAgICAgdGVtcGxhdGUgPGJvb2wgbmVlZHNEZXN0cnVjdGlvbiwgdHlw ZW5hbWUgVD4KICAgICBzdHJ1Y3QgVmVjdG9yRGVzdHJ1Y3RvcjsKIApAQCAtMzA1LDcgKzMwMiw2 IEBAIG5hbWVzcGFjZSBXVEYgewogCiAgICAgICAgIFQqIGJ1ZmZlcigpIHsgcmV0dXJuIG1fYnVm ZmVyOyB9CiAgICAgICAgIGNvbnN0IFQqIGJ1ZmZlcigpIGNvbnN0IHsgcmV0dXJuIG1fYnVmZmVy OyB9Ci0gICAgICAgIFQqKiBidWZmZXJTbG90KCkgeyByZXR1cm4gJm1fYnVmZmVyOyB9CiAgICAg ICAgIHNpemVfdCBjYXBhY2l0eSgpIGNvbnN0IHsgcmV0dXJuIG1fY2FwYWNpdHk7IH0KIAogICAg ICAgICBUKiByZWxlYXNlQnVmZmVyKCkKQEAgLTM3OCw3ICszNzQsNiBAQCBuYW1lc3BhY2UgV1RG IHsKICAgICAgICAgdXNpbmcgQmFzZTo6ZGVhbGxvY2F0ZUJ1ZmZlcjsKIAogICAgICAgICB1c2lu ZyBCYXNlOjpidWZmZXI7Ci0gICAgICAgIHVzaW5nIEJhc2U6OmJ1ZmZlclNsb3Q7CiAgICAgICAg IHVzaW5nIEJhc2U6OmNhcGFjaXR5OwogCiAgICAgICAgIHVzaW5nIEJhc2U6OnJlbGVhc2VCdWZm ZXI7CkBAIC00NzksNyArNDc0LDYgQEAgbmFtZXNwYWNlIFdURiB7CiAgICAgICAgIH0KIAogICAg ICAgICB1c2luZyBCYXNlOjpidWZmZXI7Ci0gICAgICAgIHVzaW5nIEJhc2U6OmJ1ZmZlclNsb3Q7 CiAgICAgICAgIHVzaW5nIEJhc2U6OmNhcGFjaXR5OwogCiAgICAgICAgIFQqIHJlbGVhc2VCdWZm ZXIoKQpAQCAtNTA3LDggKzUwMSw2IEBAIG5hbWVzcGFjZSBXVEYgewogICAgICAgICB0eXBlZGVm IFZlY3RvckJ1ZmZlcjxULCBpbmxpbmVDYXBhY2l0eT4gQnVmZmVyOwogICAgICAgICB0eXBlZGVm IFZlY3RvclR5cGVPcGVyYXRpb25zPFQ+IFR5cGVPcGVyYXRpb25zOwogCi0gICAgICAgIGNsYXNz IFZlY3RvclJldmVyc2VQcm94eTsKLQogICAgIHB1YmxpYzoKICAgICAgICAgdHlwZWRlZiBUIFZh bHVlVHlwZTsKIApAQCAtNTgxLDkgKzU3Myw2IEBAIG5hbWVzcGFjZSBXVEYgewogICAgICAgICBj b25zdF9yZXZlcnNlX2l0ZXJhdG9yIHJiZWdpbigpIGNvbnN0IHsgcmV0dXJuIGNvbnN0X3JldmVy c2VfaXRlcmF0b3IoZW5kKCkpOyB9CiAgICAgICAgIGNvbnN0X3JldmVyc2VfaXRlcmF0b3IgcmVu ZCgpIGNvbnN0IHsgcmV0dXJuIGNvbnN0X3JldmVyc2VfaXRlcmF0b3IoYmVnaW4oKSk7IH0KIAot ICAgICAgICBWZWN0b3JSZXZlcnNlUHJveHkmIHJldmVyc2VkKCkgeyByZXR1cm4gc3RhdGljX2Nh c3Q8VmVjdG9yUmV2ZXJzZVByb3h5Jj4oKnRoaXMpOyB9Ci0gICAgICAgIGNvbnN0IFZlY3RvclJl dmVyc2VQcm94eSYgcmV2ZXJzZWQoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxjb25zdCBW ZWN0b3JSZXZlcnNlUHJveHkmPigqdGhpcyk7IH0KLQogICAgICAgICBUJiBmaXJzdCgpIHsgcmV0 dXJuIGF0KDApOyB9CiAgICAgICAgIGNvbnN0IFQmIGZpcnN0KCkgY29uc3QgeyByZXR1cm4gYXQo MCk7IH0KICAgICAgICAgVCYgbGFzdCgpIHsgcmV0dXJuIGF0KHNpemUoKSAtIDEpOyB9CkBAIC02 NjEsMjYgKzY1MCw2IEBAIG5hbWVzcGFjZSBXVEYgewogICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFt ZSBVPiBVKiBleHBhbmRDYXBhY2l0eShzaXplX3QgbmV3TWluQ2FwYWNpdHksIFUqKTsgCiAgICAg ICAgIHRlbXBsYXRlPHR5cGVuYW1lIFU+IHZvaWQgYXBwZW5kU2xvd0Nhc2UoY29uc3QgVSYpOwog Ci0gICAgICAgIGNsYXNzIFZlY3RvclJldmVyc2VQcm94eSA6IHByaXZhdGUgVmVjdG9yIHsKLSAg ICAgICAgcHVibGljOgotICAgICAgICAgICAgdHlwZWRlZiB0eXBlbmFtZSBWZWN0b3I6OnJldmVy c2VfaXRlcmF0b3IgaXRlcmF0b3I7Ci0gICAgICAgICAgICB0eXBlZGVmIHR5cGVuYW1lIFZlY3Rv cjo6Y29uc3RfcmV2ZXJzZV9pdGVyYXRvciBjb25zdF9pdGVyYXRvcjsKLSAgICAgICAgICAgIAot ICAgICAgICAgICAgaXRlcmF0b3IgYmVnaW4oKSB7IHJldHVybiBWZWN0b3I6OnJiZWdpbigpOyB9 Ci0gICAgICAgICAgICBpdGVyYXRvciBlbmQoKSB7IHJldHVybiBWZWN0b3I6OnJlbmQoKTsgfQot ICAgICAgICAgICAgY29uc3RfaXRlcmF0b3IgYmVnaW4oKSBjb25zdCB7IHJldHVybiBWZWN0b3I6 OnJiZWdpbigpOyB9Ci0gICAgICAgICAgICBjb25zdF9pdGVyYXRvciBlbmQoKSBjb25zdCB7IHJl dHVybiBWZWN0b3I6OnJlbmQoKTsgfQotCi0gICAgICAgIHByaXZhdGU6Ci0gICAgICAgICAgICBm cmllbmQgY2xhc3MgVmVjdG9yOwotCi0gICAgICAgICAgICAvLyBUaGVzZSBhcmUgaW50ZW50aW9u YWxseSBub3QgaW1wbGVtZW50ZWQuCi0gICAgICAgICAgICBWZWN0b3JSZXZlcnNlUHJveHkoKTsK LSAgICAgICAgICAgIFZlY3RvclJldmVyc2VQcm94eShjb25zdCBWZWN0b3JSZXZlcnNlUHJveHkm KTsKLSAgICAgICAgICAgIFZlY3RvclJldmVyc2VQcm94eSYgb3BlcmF0b3I9KGNvbnN0IFZlY3Rv clJldmVyc2VQcm94eSYpOwotICAgICAgICAgICAgflZlY3RvclJldmVyc2VQcm94eSgpOwotICAg ICAgICB9OwotCiAgICAgICAgIHNpemVfdCBtX3NpemU7CiAgICAgICAgIEJ1ZmZlciBtX2J1ZmZl cjsKICAgICB9OwpAQCAtODQxLDcgKzgxMCw3IEBAIG5hbWVzcGFjZSBXVEYgewogICAgIHRlbXBs YXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0eT4KICAgICB2b2lkIFZlY3RvcjxU LCBpbmxpbmVDYXBhY2l0eT46OmV4cGFuZENhcGFjaXR5KHNpemVfdCBuZXdNaW5DYXBhY2l0eSkK ICAgICB7Ci0gICAgICAgIHJlc2VydmVDYXBhY2l0eShtYXgobmV3TWluQ2FwYWNpdHksIG1heChz dGF0aWNfY2FzdDxzaXplX3Q+KDE2KSwgY2FwYWNpdHkoKSArIGNhcGFjaXR5KCkgLyA0ICsgMSkp KTsKKyAgICAgICAgcmVzZXJ2ZUNhcGFjaXR5KHN0ZDo6bWF4KG5ld01pbkNhcGFjaXR5LCBzdGQ6 Om1heChzdGF0aWNfY2FzdDxzaXplX3Q+KDE2KSwgY2FwYWNpdHkoKSArIGNhcGFjaXR5KCkgLyA0 ICsgMSkpKTsKICAgICB9CiAgICAgCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgc2l6ZV90IGlu bGluZUNhcGFjaXR5PgpAQCAtODU5LDcgKzgyOCw3IEBAIG5hbWVzcGFjZSBXVEYgewogICAgIHRl bXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0eT4KICAgICBib29sIFZlY3Rv cjxULCBpbmxpbmVDYXBhY2l0eT46OnRyeUV4cGFuZENhcGFjaXR5KHNpemVfdCBuZXdNaW5DYXBh Y2l0eSkKICAgICB7Ci0gICAgICAgIHJldHVybiB0cnlSZXNlcnZlQ2FwYWNpdHkobWF4KG5ld01p bkNhcGFjaXR5LCBtYXgoc3RhdGljX2Nhc3Q8c2l6ZV90PigxNiksIGNhcGFjaXR5KCkgKyBjYXBh Y2l0eSgpIC8gNCArIDEpKSk7CisgICAgICAgIHJldHVybiB0cnlSZXNlcnZlQ2FwYWNpdHkoc3Rk OjptYXgobmV3TWluQ2FwYWNpdHksIHN0ZDo6bWF4KHN0YXRpY19jYXN0PHNpemVfdD4oMTYpLCBj YXBhY2l0eSgpICsgY2FwYWNpdHkoKSAvIDQgKyAxKSkpOwogICAgIH0KICAgICAKICAgICB0ZW1w bGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHk+CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmNwcAppbmRleCA1ODExNWUwNTgzZjVjNmJl YzllOTNmODMyYmY4NDA4NTczMDk3ZWVmLi5kNjBiZDYyY2YwMjhlNWRhOTc1NDcwZjQ1MzM4ZDNk NGIzZmQ1MWMwIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVk UmVzb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNv dXJjZS5jcHAKQEAgLTI5Myw5ICsyOTMsOSBAQCBkb3VibGUgQ2FjaGVkUmVzb3VyY2U6OmN1cnJl bnRBZ2UoKSBjb25zdAogICAgIC8vIFJGQzI2MTYgMTMuMi4zCiAgICAgLy8gTm8gY29tcGVuc2F0 aW9uIGZvciBsYXRlbmN5IGFzIHRoYXQgaXMgbm90IHRlcnJpYmx5IGltcG9ydGFudCBpbiBwcmFj dGljZQogICAgIGRvdWJsZSBkYXRlVmFsdWUgPSBtX3Jlc3BvbnNlLmRhdGUoKTsKLSAgICBkb3Vi bGUgYXBwYXJlbnRBZ2UgPSBpc2Zpbml0ZShkYXRlVmFsdWUpID8gbWF4KDAuLCBtX3Jlc3BvbnNl VGltZXN0YW1wIC0gZGF0ZVZhbHVlKSA6IDA7CisgICAgZG91YmxlIGFwcGFyZW50QWdlID0gaXNm aW5pdGUoZGF0ZVZhbHVlKSA/IHN0ZDo6bWF4KDAuLCBtX3Jlc3BvbnNlVGltZXN0YW1wIC0gZGF0 ZVZhbHVlKSA6IDA7CiAgICAgZG91YmxlIGFnZVZhbHVlID0gbV9yZXNwb25zZS5hZ2UoKTsKLSAg ICBkb3VibGUgY29ycmVjdGVkUmVjZWl2ZWRBZ2UgPSBpc2Zpbml0ZShhZ2VWYWx1ZSkgPyBtYXgo YXBwYXJlbnRBZ2UsIGFnZVZhbHVlKSA6IGFwcGFyZW50QWdlOworICAgIGRvdWJsZSBjb3JyZWN0 ZWRSZWNlaXZlZEFnZSA9IGlzZmluaXRlKGFnZVZhbHVlKSA/IHN0ZDo6bWF4KGFwcGFyZW50QWdl LCBhZ2VWYWx1ZSkgOiBhcHBhcmVudEFnZTsKICAgICBkb3VibGUgcmVzaWRlbnRUaW1lID0gY3Vy cmVudFRpbWUoKSAtIG1fcmVzcG9uc2VUaW1lc3RhbXA7CiAgICAgcmV0dXJuIGNvcnJlY3RlZFJl Y2VpdmVkQWdlICsgcmVzaWRlbnRUaW1lOwogfQo= 169263 2012-10-17 14:32:40 -0700 2012-10-17 14:37:45 -0700 Patch bug-99622-20121017143127.patch text/plain 23616 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 NmM5YzEzNzIyZTE1NWM4OTJlMGRhMjA3NjE5MTRlZGE2MzBkNDEwLi40MDkxY2U0ZTQ5OGZhZGVh Y2MwOWVlYTI2MDRmOGYxODE0Nzc3ZDQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxMi0xMC0xNyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgorCisgICAgICAgIENsZWFuIHVwIFZlY3Rvci5oCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTYyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBmYWxsb3V0IGZyb20gcmVtb3Zpbmcgc3RkOjpt YXggYW5kIHN0ZDo6bWluIHVzaW5nIGRlY2xhcmF0aW9ucy4KKworICAgICAgICAqIHJ1bnRpbWUv U3RyaW5nUHJvdG90eXBlLmNwcDoKKyAgICAgICAgKEpTQzo6anNTcGxpY2VTdWJzdHJpbmdzKToK KyAgICAgICAgKEpTQzo6anNTcGxpY2VTdWJzdHJpbmdzV2l0aFNlcGFyYXRvcnMpOgorICAgICAg ICAoSlNDOjpzdHJpbmdQcm90b0Z1bmNJbmRleE9mKToKKyAgICAgICAgKiB5YXJyL1lhcnJQYXR0 ZXJuLmNwcDoKKyAgICAgICAgKEpTQzo6WWFycjo6WWFyclBhdHRlcm5Db25zdHJ1Y3Rvcjo6c2V0 dXBEaXNqdW5jdGlvbk9mZnNldHMpOgorCiAyMDEyLTEwLTE3ICBNYXJrIEhhaG5lbmJlcmcgIDxt aGFobmVuYmVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQmxvY2sgZnJlZWluZyB0aHJlYWQgc2hv dWxkIHNsZWVwIGluZGVmaW5pdGVseSB3aGVuIHRoZXJlJ3Mgbm8gd29yayB0byBkbwpkaWZmIC0t Z2l0IGEvU291cmNlL1dURi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwppbmRleCBj NzkwYzg0Mzk1MDkzMWY1OGUwYzg2NWMyZWIwYWEzZDdhOTJmYjFmLi42ODRmYThhZDlkNTc1ODQz NWMyZDJiYmI3NDMxZDlmOTBhOGE5NWNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDEyLTEwLTE3 ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQ2xlYW4g dXAgVmVjdG9yLmgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTk5NjIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgUmVtb3ZlIHVudXNlZCBtZW1iZXIgZnVuY3Rpb25zIGZyb20gVmVjdG9yIGFuZCBnZXQgcmlk IG9mIHRoZSBzdGQ6Om1heCBhbmQgc3RkOjptaW4gdXNpbmcgZGVjbGFyYXRpb25zCisgICAgICAg IChhcyBwZXIgdGhlIFdlYktpdCBjb2Rpbmcgc3R5bGUgZ3VpZGVsaW5lcykuCisKKyAgICAgICAg KiBXVEYueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgVHVybnMgb3V0IFN0cmVh bUJ1ZmZlci5oIHdhcyBuZXZlciBhZGRlZCB0byB0aGUgWGNvZGUgcHJvamVjdC4KKworICAgICAg ICAqIHd0Zi9EZXF1ZS5oOgorICAgICAgICAoV1RGOjo6OmV4cGFuZENhcGFjaXR5KToKKyAgICAg ICAgKiB3dGYvU3RyZWFtQnVmZmVyLmg6CisgICAgICAgIChXVEY6OlN0cmVhbUJ1ZmZlcjo6YXBw ZW5kKToKKyAgICAgICAgQWRkIHN0ZDo6IHByZWZpeGVzIHRvIG1heCBhbmQgbWluLgorCisgICAg ICAgICogd3RmL1ZlY3Rvci5oOgorICAgICAgICBSZW1vdmUgVmVjdG9yQmFzZTo6YnVmZmVyU2xv dCgpLCBWZWN0b3JSZXZlcnNlUHJveHkgYW5kIGFkZCBzdGQ6OiBwcmVmaXhlcyB3aGVyZSBuZWVk ZWQuCisKKzIwMTItMTAtMTcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4K KwogICAgICAgICBBbHdheXMgdXNlIGZhc3RSZWFsbG9jIHdoZW4gZ3Jvd2luZyBvciBzaHJpbmtp bmcgdGhlIFZlY3RvciBidWZmZXIKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTk5NjE2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1MDU2MTNhYzE1MmIxN2YyNzdmMzQy NmYxMTQ5YTQzMzA4MjJkY2FjLi5iM2FhMGRhMjI3MzVjNjc5YTM1YzdkZjc1YjA5YjY2MzdkNzg1 NTE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMTAtMTcgIEFuZGVycyBDYXJs c3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbiB1cCBWZWN0b3IuaAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTk2MjIKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggZmFsbG91 dCBmcm9tIHJlbW92aW5nIHN0ZDo6bWF4IGFuZCBzdGQ6Om1pbiB1c2luZyBkZWNsYXJhdGlvbnMu CisKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2U6OmN1cnJlbnRBZ2UpOgorCiAyMDEyLTEwLTE3ICBBbmRy ZWFzIEtsaW5nICA8a2xpbmdAd2Via2l0Lm9yZz4KIAogICAgICAgICBTaHJpbmsgRXZlbnRUYXJn ZXREYXRhIGJ5IG1ha2luZyBmaXJpbmdFdmVudExpc3RlbmVycyB2ZWN0b3Igb3B0aW9uYWwuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJpbmdQcm90b3R5cGUu Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RyaW5nUHJvdG90eXBlLmNwcApp bmRleCAxNTQwMTc3YmVkNDNiNzI5MDA1ZTVkM2E4ZmRhZWUyZDE5MDYyZTRhLi45ZGNhNDEwNzdm NmM2MzFkMTNlZmNjOThlYjI1ZGQ2YTkzNWE4YWZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9TdHJpbmdQcm90b3R5cGUuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL1N0cmluZ1Byb3RvdHlwZS5jcHAKQEAgLTI4MCw3ICsyODAsNyBAQCBz dGF0aWMgQUxXQVlTX0lOTElORSBKU1ZhbHVlIGpzU3BsaWNlU3Vic3RyaW5ncyhFeGVjU3RhdGUq IGV4ZWMsIEpTU3RyaW5nKiBzb3VyYwogICAgICAgICBpZiAocG9zaXRpb24gPD0gMCAmJiBsZW5n dGggPj0gc291cmNlU2l6ZSkKICAgICAgICAgICAgIHJldHVybiBzb3VyY2VWYWw7CiAgICAgICAg IC8vIFdlIGNvdWxkIGNhbGwgU3RyaW5nOjpzdWJzdHJpbmdTaGFyaW5nSW1wbCgpLCBidXQgdGhp cyB3b3VsZCByZXN1bHQgaW4gcmVkdW5kYW50IGNoZWNrcy4KLSAgICAgICAgcmV0dXJuIGpzU3Ry aW5nKGV4ZWMsIFN0cmluZ0ltcGw6OmNyZWF0ZShzb3VyY2UuaW1wbCgpLCBtYXgoMCwgcG9zaXRp b24pLCBtaW4oc291cmNlU2l6ZSwgbGVuZ3RoKSkpOworICAgICAgICByZXR1cm4ganNTdHJpbmco ZXhlYywgU3RyaW5nSW1wbDo6Y3JlYXRlKHNvdXJjZS5pbXBsKCksIHN0ZDo6bWF4KDAsIHBvc2l0 aW9uKSwgc3RkOjptaW4oc291cmNlU2l6ZSwgbGVuZ3RoKSkpOwogICAgIH0KIAogICAgIGludCB0 b3RhbExlbmd0aCA9IDA7CkBAIC0zMzUsNyArMzM1LDcgQEAgc3RhdGljIEFMV0FZU19JTkxJTkUg SlNWYWx1ZSBqc1NwbGljZVN1YnN0cmluZ3NXaXRoU2VwYXJhdG9ycyhFeGVjU3RhdGUqIGV4ZWMs IEoKICAgICAgICAgaWYgKHBvc2l0aW9uIDw9IDAgJiYgbGVuZ3RoID49IHNvdXJjZVNpemUpCiAg ICAgICAgICAgICByZXR1cm4gc291cmNlVmFsOwogICAgICAgICAvLyBXZSBjb3VsZCBjYWxsIFN0 cmluZzo6c3Vic3RyaW5nU2hhcmluZ0ltcGwoKSwgYnV0IHRoaXMgd291bGQgcmVzdWx0IGluIHJl ZHVuZGFudCBjaGVja3MuCi0gICAgICAgIHJldHVybiBqc1N0cmluZyhleGVjLCBTdHJpbmdJbXBs OjpjcmVhdGUoc291cmNlLmltcGwoKSwgbWF4KDAsIHBvc2l0aW9uKSwgbWluKHNvdXJjZVNpemUs IGxlbmd0aCkpKTsKKyAgICAgICAgcmV0dXJuIGpzU3RyaW5nKGV4ZWMsIFN0cmluZ0ltcGw6OmNy ZWF0ZShzb3VyY2UuaW1wbCgpLCBzdGQ6Om1heCgwLCBwb3NpdGlvbiksIHN0ZDo6bWluKHNvdXJj ZVNpemUsIGxlbmd0aCkpKTsKICAgICB9CiAKICAgICBpbnQgdG90YWxMZW5ndGggPSAwOwpAQCAt MzU5LDcgKzM1OSw3IEBAIHN0YXRpYyBBTFdBWVNfSU5MSU5FIEpTVmFsdWUganNTcGxpY2VTdWJz dHJpbmdzV2l0aFNlcGFyYXRvcnMoRXhlY1N0YXRlKiBleGVjLCBKCiAgICAgICAgIGlmICghaW1w bCkKICAgICAgICAgICAgIHJldHVybiB0aHJvd091dE9mTWVtb3J5RXJyb3IoZXhlYyk7CiAKLSAg ICAgICAgaW50IG1heENvdW50ID0gbWF4KHJhbmdlQ291bnQsIHNlcGFyYXRvckNvdW50KTsKKyAg ICAgICAgaW50IG1heENvdW50ID0gc3RkOjptYXgocmFuZ2VDb3VudCwgc2VwYXJhdG9yQ291bnQp OwogICAgICAgICBpbnQgYnVmZmVyUG9zID0gMDsKICAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkg PCBtYXhDb3VudDsgaSsrKSB7CiAgICAgICAgICAgICBpZiAoaSA8IHJhbmdlQ291bnQpIHsKQEAg LTM4NCw3ICszODQsNyBAQCBzdGF0aWMgQUxXQVlTX0lOTElORSBKU1ZhbHVlIGpzU3BsaWNlU3Vi c3RyaW5nc1dpdGhTZXBhcmF0b3JzKEV4ZWNTdGF0ZSogZXhlYywgSgogICAgIGlmICghaW1wbCkK ICAgICAgICAgcmV0dXJuIHRocm93T3V0T2ZNZW1vcnlFcnJvcihleGVjKTsKIAotICAgIGludCBt YXhDb3VudCA9IG1heChyYW5nZUNvdW50LCBzZXBhcmF0b3JDb3VudCk7CisgICAgaW50IG1heENv dW50ID0gc3RkOjptYXgocmFuZ2VDb3VudCwgc2VwYXJhdG9yQ291bnQpOwogICAgIGludCBidWZm ZXJQb3MgPSAwOwogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbWF4Q291bnQ7IGkrKykgewogICAg ICAgICBpZiAoaSA8IHJhbmdlQ291bnQpIHsKQEAgLTc2Nyw3ICs3NjcsNyBAQCBFbmNvZGVkSlNW YWx1ZSBKU0NfSE9TVF9DQUxMIHN0cmluZ1Byb3RvRnVuY0luZGV4T2YoRXhlY1N0YXRlKiBleGVj KQogICAgICAgICB1bnNpZ25lZCBwb3M7CiAgICAgICAgIGludCBsZW4gPSBzLmxlbmd0aCgpOwog ICAgICAgICBpZiAoYTEuaXNVSW50MzIoKSkKLSAgICAgICAgICAgIHBvcyA9IG1pbjx1aW50MzJf dD4oYTEuYXNVSW50MzIoKSwgbGVuKTsKKyAgICAgICAgICAgIHBvcyA9IHN0ZDo6bWluPHVpbnQz Ml90PihhMS5hc1VJbnQzMigpLCBsZW4pOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIGRv dWJsZSBkcG9zID0gYTEudG9JbnRlZ2VyKGV4ZWMpOwogICAgICAgICAgICAgaWYgKGRwb3MgPCAw KQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyclBhdHRlcm4uY3Bw IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyclBhdHRlcm4uY3BwCmluZGV4IDUwODA5 MjlmNGE0MTlkZjIwMzQ0ODI2NTZlN2RlMmI5OTUzYjQ2OWEuLmM5NTNhMzhkMmY0ZjFhZTJlMzE3 NWFjMTZlZmJkM2M2ZmYxZDlkZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95 YXJyL1lhcnJQYXR0ZXJuLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJy UGF0dGVybi5jcHAKQEAgLTY1Nyw4ICs2NTcsOCBAQCBwdWJsaWM6CiAgICAgICAgIGZvciAodW5z aWduZWQgYWx0ID0gMDsgYWx0IDwgZGlzanVuY3Rpb24tPm1fYWx0ZXJuYXRpdmVzLnNpemUoKTsg KythbHQpIHsKICAgICAgICAgICAgIFBhdHRlcm5BbHRlcm5hdGl2ZSogYWx0ZXJuYXRpdmUgPSBk aXNqdW5jdGlvbi0+bV9hbHRlcm5hdGl2ZXNbYWx0XTsKICAgICAgICAgICAgIHVuc2lnbmVkIGN1 cnJlbnRBbHRlcm5hdGl2ZUNhbGxGcmFtZVNpemUgPSBzZXR1cEFsdGVybmF0aXZlT2Zmc2V0cyhh bHRlcm5hdGl2ZSwgaW5pdGlhbENhbGxGcmFtZVNpemUsIGluaXRpYWxJbnB1dFBvc2l0aW9uKTsK LSAgICAgICAgICAgIG1pbmltdW1JbnB1dFNpemUgPSBtaW4obWluaW11bUlucHV0U2l6ZSwgYWx0 ZXJuYXRpdmUtPm1fbWluaW11bVNpemUpOwotICAgICAgICAgICAgbWF4aW11bUNhbGxGcmFtZVNp emUgPSBtYXgobWF4aW11bUNhbGxGcmFtZVNpemUsIGN1cnJlbnRBbHRlcm5hdGl2ZUNhbGxGcmFt ZVNpemUpOworICAgICAgICAgICAgbWluaW11bUlucHV0U2l6ZSA9IHN0ZDo6bWluKG1pbmltdW1J bnB1dFNpemUsIGFsdGVybmF0aXZlLT5tX21pbmltdW1TaXplKTsKKyAgICAgICAgICAgIG1heGlt dW1DYWxsRnJhbWVTaXplID0gc3RkOjptYXgobWF4aW11bUNhbGxGcmFtZVNpemUsIGN1cnJlbnRB bHRlcm5hdGl2ZUNhbGxGcmFtZVNpemUpOwogICAgICAgICAgICAgaGFzRml4ZWRTaXplICY9IGFs dGVybmF0aXZlLT5tX2hhc0ZpeGVkU2l6ZTsKICAgICAgICAgfQogICAgICAgICAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XVEYvV1RGLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV1RG L1dURi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IGI4YWE1M2JlNGM5MjlhYzk3ZTdl ZTJhZGUyMmIwZDA2NjhkMzJjY2IuLjFmMTYwMjQ2ZThjY2QxNzkyMDdlN2Q5YzgzZmMxMTA2MWQ4 YTA4ZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvV1RGLnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2oKKysrIGIvU291cmNlL1dURi9XVEYueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtMTEs NiArMTEsNyBAQAogCQkxNDNGNjExRjE1NjVGMEY5MDBEQjUxNEEgLyogUkFNU2l6ZS5jcHAgaW4g U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxNDNGNjExRDE1NjVG MEY5MDBEQjUxNEEgLyogUkFNU2l6ZS5jcHAgKi87IH07CiAJCTE0M0Y2MTIwMTU2NUYwRjkwMERC NTE0QSAvKiBSQU1TaXplLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSAxNDNGNjExRTE1NjVGMEY5MDBEQjUxNEEgLyogUkFNU2l6ZS5oICovOyBzZXR0aW5n cyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTE0RjNCMEY3MTVFNDVFNDYw MDIxMDA2OSAvKiBTYXR1cmF0ZWRBcml0aG1ldGljLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxNEYzQjBGNjE1RTQ1RTQ2MDAyMTAwNjkgLyogU2F0dXJh dGVkQXJpdGhtZXRpYy5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7 IH07IH07CisJCTFBNkJCNzY5MTYyRjMwMDUwMEREMTZEQiAvKiBTdHJlYW1CdWZmZXIuaCBpbiBI ZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBNkJCNzY4MTYyRjMw MDUwMEREMTZEQiAvKiBTdHJlYW1CdWZmZXIuaCAqLzsgfTsKIAkJMjYxNDdCMEExNUREQ0NEQzAw RERCOTA3IC8qIEludGVnZXJUb1N0cmluZ0NvbnZlcnNpb24uaCBpbiBIZWFkZXJzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDI2MTQ3QjA4MTVERENDREMwMEREQjkwNyAvKiBJ bnRlZ2VyVG9TdHJpbmdDb252ZXJzaW9uLmggKi87IH07CiAJCTI2NjExMjJFMTYwRkVBRDQwMDEz RjVDMyAvKiBVUkxRdWVyeUNoYXJzZXRDb252ZXJ0ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDI2NjExMjJEMTYwRkVBRDQwMDEzRjVDMyAvKiBVUkxR dWVyeUNoYXJzZXRDb252ZXJ0ZXIuaCAqLzsgfTsKIAkJMjZFNkMxRUUxNjA5MDM3MzAwQ0E2QUY0 IC8qIFVSTENhbm9uRXRjLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDI2RTZDMUNFMTYwOTAzNzMwMENBNkFGNCAvKiBVUkxDYW5vbkV0Yy5jcHAgKi87 IH07CkBAIC02OCw3ICs2OSw2IEBACiAJCUE4QTQ3MzhGMTUxQTgyNUIwMDQxMjNGRiAvKiBCbG9v bUZpbHRlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g QThBNDcyNjUxNTFBODI1QTAwNDEyM0ZGIC8qIEJsb29tRmlsdGVyLmggKi87IH07CiAJCUE4QTQ3 MzkwMTUxQTgyNUIwMDQxMjNGRiAvKiBCb3VuZHNDaGVja2VkUG9pbnRlci5oIGluIEhlYWRlcnMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQThBNDcyNjYxNTFBODI1QTAwNDEy M0ZGIC8qIEJvdW5kc0NoZWNrZWRQb2ludGVyLmggKi87IH07CiAJCUE4QTQ3MzkxMTUxQTgyNUIw MDQxMjNGRiAvKiBCdW1wUG9pbnRlckFsbG9jYXRvci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQThBNDcyNjcxNTFBODI1QTAwNDEyM0ZGIC8qIEJ1bXBQ b2ludGVyQWxsb2NhdG9yLmggKi87IH07Ci0JCUVCOTVFMUYwMTYxQTcyNDEwMDg5QTJGNSAvKiBC eXRlT3JkZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IEVCOTVFMUVGMTYxQTcyNDEwMDg5QTJGNSAvKiBCeXRlT3JkZXIuaCAqLzsgfTsKIAkJQThBNDcz OTQxNTFBODI1QjAwNDEyM0ZGIC8qIENoZWNrZWRBcml0aG1ldGljLmggaW4gSGVhZGVycyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBOEE0NzI2QTE1MUE4MjVBMDA0MTIzRkYg LyogQ2hlY2tlZEFyaXRobWV0aWMuaCAqLzsgfTsKIAkJQThBNDczOTUxNTFBODI1QjAwNDEyM0ZG IC8qIENoZWNrZWRCb29sZWFuLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSBBOEE0NzI2QjE1MUE4MjVBMDA0MTIzRkYgLyogQ2hlY2tlZEJvb2xlYW4uaCAq LzsgfTsKIAkJQThBNDczOTgxNTFBODI1QjAwNDEyM0ZGIC8qIENvbXBpbGVyLmggaW4gSGVhZGVy cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBOEE0NzI3MDE1MUE4MjVBMDA0 MTIzRkYgLyogQ29tcGlsZXIuaCAqLzsgfTsKQEAgLTI3OCw2ICsyNzgsNyBAQAogCQlBOEE0NzQ4 QzE1MUE4MjY0MDA0MTIzRkYgLyogY29uZmlnLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSBBOEE0NzQ4QjE1MUE4MjY0MDA0MTIzRkYgLyogY29uZmlnLmgg Ki87IH07CiAJCUNENTQ5N0FDMTU4NTdEMDMwMEI1QkMzMCAvKiBNZWRpYVRpbWUuY3BwIGluIFNv dXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQ0Q1NDk3QUExNTg1N0Qw MzAwQjVCQzMwIC8qIE1lZGlhVGltZS5jcHAgKi87IH07CiAJCUNENTQ5N0FEMTU4NTdEMDMwMEI1 QkMzMCAvKiBNZWRpYVRpbWUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IENENTQ5N0FCMTU4NTdEMDMwMEI1QkMzMCAvKiBNZWRpYVRpbWUuaCAqLzsgfTsK KwkJRUI5NUUxRjAxNjFBNzI0MTAwODlBMkY1IC8qIEJ5dGVPcmRlci5oIGluIEhlYWRlcnMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRUI5NUUxRUYxNjFBNzI0MTAwODlBMkY1 IC8qIEJ5dGVPcmRlci5oICovOyB9OwogCQlGMzUyNUU0NjE2MTlBNEVFMDAyNzhCQzEgLyogTWVt b3J5SW5zdHJ1bWVudGF0aW9uSGFzaE1hcC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gRjM1MjVFNDUxNjE5QTRFRTAwMjc4QkMxIC8qIE1lbW9yeUluc3Ry dW1lbnRhdGlvbkhhc2hNYXAuaCAqLzsgfTsKIAkJRjNGQkM3MUUxNjFBRjdCRjAwQkI0QkQ0IC8q IE1lbW9yeUluc3RydW1lbnRhdGlvbkhhc2hDb3VudGVkU2V0LmggaW4gSGVhZGVycyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGM0ZCQzcxRDE2MUFGN0JGMDBCQjRCRDQgLyog TWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaENvdW50ZWRTZXQuaCAqLzsgfTsKIAkJRjNGQkM3MjAx NjFBRjdDRDAwQkI0QkQ0IC8qIE1lbW9yeUluc3RydW1lbnRhdGlvblNlcXVlbmNlLmggaW4gSGVh ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGM0ZCQzcxRjE2MUFGN0NE MDBCQjRCRDQgLyogTWVtb3J5SW5zdHJ1bWVudGF0aW9uU2VxdWVuY2UuaCAqLzsgfTsKQEAgLTI4 OCw2ICsyODksNyBAQAogCQkxNDNGNjExRDE1NjVGMEY5MDBEQjUxNEEgLyogUkFNU2l6ZS5jcHAg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBSQU1TaXplLmNwcDsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMTQzRjYxMUUxNTY1RjBGOTAwREI1MTRBIC8qIFJBTVNp emUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gUkFNU2l6ZS5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQkxNEYzQjBGNjE1RTQ1RTQ2MDAyMTAwNjkgLyogU2F0dXJh dGVkQXJpdGhtZXRpYy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBTYXR1cmF0 ZWRBcml0aG1ldGljLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTFBNkJCNzY4MTYy RjMwMDUwMEREMTZEQiAvKiBTdHJlYW1CdWZmZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gU3RyZWFtQnVmZmVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTI2 MTQ3QjA4MTVERENDREMwMEREQjkwNyAvKiBJbnRlZ2VyVG9TdHJpbmdDb252ZXJzaW9uLmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEludGVnZXJUb1N0cmluZ0NvbnZlcnNpb24u aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMjY2MTEyMkQxNjBGRUFENDAwMTNGNUMz IC8qIFVSTFF1ZXJ5Q2hhcnNldENvbnZlcnRlci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7 IHBhdGggPSBVUkxRdWVyeUNoYXJzZXRDb252ZXJ0ZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJMjZFNkMxQ0UxNjA5MDM3MzAwQ0E2QUY0IC8qIFVSTENhbm9uRXRjLmNwcCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFVSTENhbm9uRXRjLmNwcDsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTM1MSw3ICszNTMsNiBAQAogCQlBOEE0NzI2NTE1MUE4 MjVBMDA0MTIzRkYgLyogQmxvb21GaWx0ZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw YXRoID0gQmxvb21GaWx0ZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQThBNDcy NjYxNTFBODI1QTAwNDEyM0ZGIC8qIEJvdW5kc0NoZWNrZWRQb2ludGVyLmggKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEJvdW5kc0NoZWNrZWRQb2ludGVyLmg7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCUE4QTQ3MjY3MTUxQTgyNUEwMDQxMjNGRiAvKiBCdW1wUG9pbnRl ckFsbG9jYXRvci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBCdW1wUG9pbnRl ckFsbG9jYXRvci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwotCQlFQjk1RTFFRjE2MUE3 MjQxMDA4OUEyRjUgLyogQnl0ZU9yZGVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0 aCA9IEJ5dGVPcmRlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlBOEE0NzI2QTE1 MUE4MjVBMDA0MTIzRkYgLyogQ2hlY2tlZEFyaXRobWV0aWMuaCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuYy5oOyBwYXRoID0gQ2hlY2tlZEFyaXRobWV0aWMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJQThBNDcyNkIxNTFBODI1QTAwNDEyM0ZGIC8qIENoZWNrZWRCb29sZWFuLmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IENoZWNrZWRCb29sZWFuLmg7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCUE4QTQ3MjcwMTUxQTgyNUEwMDQxMjNGRiAvKiBDb21waWxl ci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBDb21waWxlci5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwpAQCAtNTY0LDYgKzU2NSw3IEBACiAJCUE4QTQ3NDhCMTUxQTgy NjQwMDQxMjNGRiAvKiBjb25maWcuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0g Y29uZmlnLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUNENTQ5N0FBMTU4NTdEMDMw MEI1QkMzMCAvKiBNZWRpYVRpbWUuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBw YXRoID0gTWVkaWFUaW1lLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQ0Q1NDk3 QUIxNTg1N0QwMzAwQjVCQzMwIC8qIE1lZGlhVGltZS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j Lmg7IHBhdGggPSBNZWRpYVRpbWUuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJRUI5 NUUxRUYxNjFBNzI0MTAwODlBMkY1IC8qIEJ5dGVPcmRlci5oICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jLmg7IHBhdGggPSBCeXRlT3JkZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ RjM1MjVFNDUxNjE5QTRFRTAwMjc4QkMxIC8qIE1lbW9yeUluc3RydW1lbnRhdGlvbkhhc2hNYXAu aCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gTWVtb3J5SW5zdHJ1bWVudGF0aW9u SGFzaE1hcC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlGM0ZCQzcxRDE2MUFGN0JG MDBCQjRCRDQgLyogTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaENvdW50ZWRTZXQuaCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaENvdW50 ZWRTZXQuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJRjNGQkM3MUYxNjFBRjdDRDAw QkI0QkQ0IC8qIE1lbW9yeUluc3RydW1lbnRhdGlvblNlcXVlbmNlLmggKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmMuaDsgcGF0aCA9IE1lbW9yeUluc3RydW1lbnRhdGlvblNlcXVlbmNlLmg7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC03NzgsNiArNzgwLDcgQEAKIAkJCQlBOEE0NzMwRjE1 MUE4MjVCMDA0MTIzRkYgLyogU3RhY2tCb3VuZHMuaCAqLywKIAkJCQlBOEE0NzMxMDE1MUE4MjVC MDA0MTIzRkYgLyogU3RhdGljQ29uc3RydWN0b3JzLmggKi8sCiAJCQkJQThBNDczMTExNTFBODI1 QjAwNDEyM0ZGIC8qIFN0ZExpYkV4dHJhcy5oICovLAorCQkJCTFBNkJCNzY4MTYyRjMwMDUwMERE MTZEQiAvKiBTdHJlYW1CdWZmZXIuaCAqLywKIAkJCQlBOEE0NzMxMjE1MUE4MjVCMDA0MTIzRkYg LyogU3RyaW5nRXh0cmFzLmNwcCAqLywKIAkJCQlBOEE0NzMxMzE1MUE4MjVCMDA0MTIzRkYgLyog U3RyaW5nRXh0cmFzLmggKi8sCiAJCQkJQThBNDczMTQxNTFBODI1QjAwNDEyM0ZGIC8qIFN0cmlu Z0hhc2hlci5oICovLApAQCAtMTE3Nyw2ICsxMTgwLDcgQEAKIAkJCQk0RkQyQTM1OTE2MUIwRUUx MDBFQkYyMzYgLyogTWVtb3J5SW5zdHJ1bWVudGF0aW9uUGFyc2VkVVJMLmggaW4gSGVhZGVycyAq LywKIAkJCQlGM0ZCQzcxRTE2MUFGN0JGMDBCQjRCRDQgLyogTWVtb3J5SW5zdHJ1bWVudGF0aW9u SGFzaENvdW50ZWRTZXQuaCBpbiBIZWFkZXJzICovLAogCQkJCUYzRkJDNzIwMTYxQUY3Q0QwMEJC NEJENCAvKiBNZW1vcnlJbnN0cnVtZW50YXRpb25TZXF1ZW5jZS5oIGluIEhlYWRlcnMgKi8sCisJ CQkJMUE2QkI3NjkxNjJGMzAwNTAwREQxNkRCIC8qIFN0cmVhbUJ1ZmZlci5oIGluIEhlYWRlcnMg Ki8sCiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CiAJ CX07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9EZXF1ZS5oIGIvU291cmNlL1dURi93dGYv RGVxdWUuaAppbmRleCA0N2MwZGZmZmEzYjhkY2Q3ODU1OGE2M2NjYmJkYmExMzIyODJjNGU4Li5i ZTY5YzgxZGIzYzhlNDgzZGJhNGUwOWE1NjU0NTAzNjg3ZTNlYzgxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV1RGL3d0Zi9EZXF1ZS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL0RlcXVlLmgKQEAgLTQyNiw3 ICs0MjYsNyBAQCBuYW1lc3BhY2UgV1RGIHsKICAgICB7CiAgICAgICAgIGNoZWNrVmFsaWRpdHko KTsKICAgICAgICAgc2l6ZV90IG9sZENhcGFjaXR5ID0gbV9idWZmZXIuY2FwYWNpdHkoKTsKLSAg ICAgICAgc2l6ZV90IG5ld0NhcGFjaXR5ID0gbWF4KHN0YXRpY19jYXN0PHNpemVfdD4oMTYpLCBv bGRDYXBhY2l0eSArIG9sZENhcGFjaXR5IC8gNCArIDEpOworICAgICAgICBzaXplX3QgbmV3Q2Fw YWNpdHkgPSBzdGQ6Om1heChzdGF0aWNfY2FzdDxzaXplX3Q+KDE2KSwgb2xkQ2FwYWNpdHkgKyBv bGRDYXBhY2l0eSAvIDQgKyAxKTsKICAgICAgICAgVCogb2xkQnVmZmVyID0gbV9idWZmZXIuYnVm ZmVyKCk7CiAgICAgICAgIG1fYnVmZmVyLmFsbG9jYXRlQnVmZmVyKG5ld0NhcGFjaXR5KTsKICAg ICAgICAgaWYgKG1fc3RhcnQgPD0gbV9lbmQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9T dHJlYW1CdWZmZXIuaCBiL1NvdXJjZS9XVEYvd3RmL1N0cmVhbUJ1ZmZlci5oCmluZGV4IGFkZDI1 NDlkNmNhZWQ5ODgxNzJmYTc2OGRhNGMzMzIzMzc2MzY2NjQuLmU3ZDk1OGY2OWMzMmZjOTI1MWZj ZTFhMDNhM2Q5ZjNjZWJkZTYzZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1N0cmVhbUJ1 ZmZlci5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL1N0cmVhbUJ1ZmZlci5oCkBAIC02Myw3ICs2Myw3 IEBAIHB1YmxpYzoKICAgICAgICAgd2hpbGUgKHNpemUpIHsKICAgICAgICAgICAgIGlmICghbV9i dWZmZXIuc2l6ZSgpIHx8IG1fYnVmZmVyLmxhc3QoKS0+c2l6ZSgpID09IEJsb2NrU2l6ZSkKICAg ICAgICAgICAgICAgICBtX2J1ZmZlci5hcHBlbmQoYWRvcHRQdHIobmV3IEJsb2NrKSk7Ci0gICAg ICAgICAgICBzaXplX3QgYXBwZW5kU2l6ZSA9IG1pbihCbG9ja1NpemUgLSBtX2J1ZmZlci5sYXN0 KCktPnNpemUoKSwgc2l6ZSk7CisgICAgICAgICAgICBzaXplX3QgYXBwZW5kU2l6ZSA9IHN0ZDo6 bWluKEJsb2NrU2l6ZSAtIG1fYnVmZmVyLmxhc3QoKS0+c2l6ZSgpLCBzaXplKTsKICAgICAgICAg ICAgIG1fYnVmZmVyLmxhc3QoKS0+YXBwZW5kKGRhdGEsIGFwcGVuZFNpemUpOwogICAgICAgICAg ICAgZGF0YSArPSBhcHBlbmRTaXplOwogICAgICAgICAgICAgc2l6ZSAtPSBhcHBlbmRTaXplOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvVmVjdG9yLmggYi9Tb3VyY2UvV1RGL3d0Zi9WZWN0 b3IuaAppbmRleCAwYmM1NmY4NDEwZWU4MjY2MjFkN2E4MDQxNGUyYTM2ZmE1MGNjMGNjLi5kMmRl ZGVmZWE4ZjkxYmYwOWZmMGZmNDhhN2JkNTgzZmY3NDY5NGU1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V1RGL3d0Zi9WZWN0b3IuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9WZWN0b3IuaApAQCAtMzQsOSAr MzQsNiBAQAogCiBuYW1lc3BhY2UgV1RGIHsKIAotICAgIHVzaW5nIHN0ZDo6bWluOwotICAgIHVz aW5nIHN0ZDo6bWF4OwotCiAgICAgdGVtcGxhdGUgPGJvb2wgbmVlZHNEZXN0cnVjdGlvbiwgdHlw ZW5hbWUgVD4KICAgICBzdHJ1Y3QgVmVjdG9yRGVzdHJ1Y3RvcjsKIApAQCAtMzA1LDcgKzMwMiw2 IEBAIG5hbWVzcGFjZSBXVEYgewogCiAgICAgICAgIFQqIGJ1ZmZlcigpIHsgcmV0dXJuIG1fYnVm ZmVyOyB9CiAgICAgICAgIGNvbnN0IFQqIGJ1ZmZlcigpIGNvbnN0IHsgcmV0dXJuIG1fYnVmZmVy OyB9Ci0gICAgICAgIFQqKiBidWZmZXJTbG90KCkgeyByZXR1cm4gJm1fYnVmZmVyOyB9CiAgICAg ICAgIHNpemVfdCBjYXBhY2l0eSgpIGNvbnN0IHsgcmV0dXJuIG1fY2FwYWNpdHk7IH0KIAogICAg ICAgICBUKiByZWxlYXNlQnVmZmVyKCkKQEAgLTM3OCw3ICszNzQsNiBAQCBuYW1lc3BhY2UgV1RG IHsKICAgICAgICAgdXNpbmcgQmFzZTo6ZGVhbGxvY2F0ZUJ1ZmZlcjsKIAogICAgICAgICB1c2lu ZyBCYXNlOjpidWZmZXI7Ci0gICAgICAgIHVzaW5nIEJhc2U6OmJ1ZmZlclNsb3Q7CiAgICAgICAg IHVzaW5nIEJhc2U6OmNhcGFjaXR5OwogCiAgICAgICAgIHVzaW5nIEJhc2U6OnJlbGVhc2VCdWZm ZXI7CkBAIC00NzksNyArNDc0LDYgQEAgbmFtZXNwYWNlIFdURiB7CiAgICAgICAgIH0KIAogICAg ICAgICB1c2luZyBCYXNlOjpidWZmZXI7Ci0gICAgICAgIHVzaW5nIEJhc2U6OmJ1ZmZlclNsb3Q7 CiAgICAgICAgIHVzaW5nIEJhc2U6OmNhcGFjaXR5OwogCiAgICAgICAgIFQqIHJlbGVhc2VCdWZm ZXIoKQpAQCAtNTA3LDggKzUwMSw2IEBAIG5hbWVzcGFjZSBXVEYgewogICAgICAgICB0eXBlZGVm IFZlY3RvckJ1ZmZlcjxULCBpbmxpbmVDYXBhY2l0eT4gQnVmZmVyOwogICAgICAgICB0eXBlZGVm IFZlY3RvclR5cGVPcGVyYXRpb25zPFQ+IFR5cGVPcGVyYXRpb25zOwogCi0gICAgICAgIGNsYXNz IFZlY3RvclJldmVyc2VQcm94eTsKLQogICAgIHB1YmxpYzoKICAgICAgICAgdHlwZWRlZiBUIFZh bHVlVHlwZTsKIApAQCAtNTgxLDkgKzU3Myw2IEBAIG5hbWVzcGFjZSBXVEYgewogICAgICAgICBj b25zdF9yZXZlcnNlX2l0ZXJhdG9yIHJiZWdpbigpIGNvbnN0IHsgcmV0dXJuIGNvbnN0X3JldmVy c2VfaXRlcmF0b3IoZW5kKCkpOyB9CiAgICAgICAgIGNvbnN0X3JldmVyc2VfaXRlcmF0b3IgcmVu ZCgpIGNvbnN0IHsgcmV0dXJuIGNvbnN0X3JldmVyc2VfaXRlcmF0b3IoYmVnaW4oKSk7IH0KIAot ICAgICAgICBWZWN0b3JSZXZlcnNlUHJveHkmIHJldmVyc2VkKCkgeyByZXR1cm4gc3RhdGljX2Nh c3Q8VmVjdG9yUmV2ZXJzZVByb3h5Jj4oKnRoaXMpOyB9Ci0gICAgICAgIGNvbnN0IFZlY3RvclJl dmVyc2VQcm94eSYgcmV2ZXJzZWQoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxjb25zdCBW ZWN0b3JSZXZlcnNlUHJveHkmPigqdGhpcyk7IH0KLQogICAgICAgICBUJiBmaXJzdCgpIHsgcmV0 dXJuIGF0KDApOyB9CiAgICAgICAgIGNvbnN0IFQmIGZpcnN0KCkgY29uc3QgeyByZXR1cm4gYXQo MCk7IH0KICAgICAgICAgVCYgbGFzdCgpIHsgcmV0dXJuIGF0KHNpemUoKSAtIDEpOyB9CkBAIC02 NjEsMjYgKzY1MCw2IEBAIG5hbWVzcGFjZSBXVEYgewogICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFt ZSBVPiBVKiBleHBhbmRDYXBhY2l0eShzaXplX3QgbmV3TWluQ2FwYWNpdHksIFUqKTsgCiAgICAg ICAgIHRlbXBsYXRlPHR5cGVuYW1lIFU+IHZvaWQgYXBwZW5kU2xvd0Nhc2UoY29uc3QgVSYpOwog Ci0gICAgICAgIGNsYXNzIFZlY3RvclJldmVyc2VQcm94eSA6IHByaXZhdGUgVmVjdG9yIHsKLSAg ICAgICAgcHVibGljOgotICAgICAgICAgICAgdHlwZWRlZiB0eXBlbmFtZSBWZWN0b3I6OnJldmVy c2VfaXRlcmF0b3IgaXRlcmF0b3I7Ci0gICAgICAgICAgICB0eXBlZGVmIHR5cGVuYW1lIFZlY3Rv cjo6Y29uc3RfcmV2ZXJzZV9pdGVyYXRvciBjb25zdF9pdGVyYXRvcjsKLSAgICAgICAgICAgIAot ICAgICAgICAgICAgaXRlcmF0b3IgYmVnaW4oKSB7IHJldHVybiBWZWN0b3I6OnJiZWdpbigpOyB9 Ci0gICAgICAgICAgICBpdGVyYXRvciBlbmQoKSB7IHJldHVybiBWZWN0b3I6OnJlbmQoKTsgfQot ICAgICAgICAgICAgY29uc3RfaXRlcmF0b3IgYmVnaW4oKSBjb25zdCB7IHJldHVybiBWZWN0b3I6 OnJiZWdpbigpOyB9Ci0gICAgICAgICAgICBjb25zdF9pdGVyYXRvciBlbmQoKSBjb25zdCB7IHJl dHVybiBWZWN0b3I6OnJlbmQoKTsgfQotCi0gICAgICAgIHByaXZhdGU6Ci0gICAgICAgICAgICBm cmllbmQgY2xhc3MgVmVjdG9yOwotCi0gICAgICAgICAgICAvLyBUaGVzZSBhcmUgaW50ZW50aW9u YWxseSBub3QgaW1wbGVtZW50ZWQuCi0gICAgICAgICAgICBWZWN0b3JSZXZlcnNlUHJveHkoKTsK LSAgICAgICAgICAgIFZlY3RvclJldmVyc2VQcm94eShjb25zdCBWZWN0b3JSZXZlcnNlUHJveHkm KTsKLSAgICAgICAgICAgIFZlY3RvclJldmVyc2VQcm94eSYgb3BlcmF0b3I9KGNvbnN0IFZlY3Rv clJldmVyc2VQcm94eSYpOwotICAgICAgICAgICAgflZlY3RvclJldmVyc2VQcm94eSgpOwotICAg ICAgICB9OwotCiAgICAgICAgIHNpemVfdCBtX3NpemU7CiAgICAgICAgIEJ1ZmZlciBtX2J1ZmZl cjsKICAgICB9OwpAQCAtODQxLDcgKzgxMCw3IEBAIG5hbWVzcGFjZSBXVEYgewogICAgIHRlbXBs YXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0eT4KICAgICB2b2lkIFZlY3RvcjxU LCBpbmxpbmVDYXBhY2l0eT46OmV4cGFuZENhcGFjaXR5KHNpemVfdCBuZXdNaW5DYXBhY2l0eSkK ICAgICB7Ci0gICAgICAgIHJlc2VydmVDYXBhY2l0eShtYXgobmV3TWluQ2FwYWNpdHksIG1heChz dGF0aWNfY2FzdDxzaXplX3Q+KDE2KSwgY2FwYWNpdHkoKSArIGNhcGFjaXR5KCkgLyA0ICsgMSkp KTsKKyAgICAgICAgcmVzZXJ2ZUNhcGFjaXR5KHN0ZDo6bWF4KG5ld01pbkNhcGFjaXR5LCBzdGQ6 Om1heChzdGF0aWNfY2FzdDxzaXplX3Q+KDE2KSwgY2FwYWNpdHkoKSArIGNhcGFjaXR5KCkgLyA0 ICsgMSkpKTsKICAgICB9CiAgICAgCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgc2l6ZV90IGlu bGluZUNhcGFjaXR5PgpAQCAtODU5LDcgKzgyOCw3IEBAIG5hbWVzcGFjZSBXVEYgewogICAgIHRl bXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0eT4KICAgICBib29sIFZlY3Rv cjxULCBpbmxpbmVDYXBhY2l0eT46OnRyeUV4cGFuZENhcGFjaXR5KHNpemVfdCBuZXdNaW5DYXBh Y2l0eSkKICAgICB7Ci0gICAgICAgIHJldHVybiB0cnlSZXNlcnZlQ2FwYWNpdHkobWF4KG5ld01p bkNhcGFjaXR5LCBtYXgoc3RhdGljX2Nhc3Q8c2l6ZV90PigxNiksIGNhcGFjaXR5KCkgKyBjYXBh Y2l0eSgpIC8gNCArIDEpKSk7CisgICAgICAgIHJldHVybiB0cnlSZXNlcnZlQ2FwYWNpdHkoc3Rk OjptYXgobmV3TWluQ2FwYWNpdHksIHN0ZDo6bWF4KHN0YXRpY19jYXN0PHNpemVfdD4oMTYpLCBj YXBhY2l0eSgpICsgY2FwYWNpdHkoKSAvIDQgKyAxKSkpOwogICAgIH0KICAgICAKICAgICB0ZW1w bGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHk+CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmNwcAppbmRleCA1ODExNWUwNTgzZjVjNmJl YzllOTNmODMyYmY4NDA4NTczMDk3ZWVmLi5kNjBiZDYyY2YwMjhlNWRhOTc1NDcwZjQ1MzM4ZDNk NGIzZmQ1MWMwIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVk UmVzb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNv dXJjZS5jcHAKQEAgLTI5Myw5ICsyOTMsOSBAQCBkb3VibGUgQ2FjaGVkUmVzb3VyY2U6OmN1cnJl bnRBZ2UoKSBjb25zdAogICAgIC8vIFJGQzI2MTYgMTMuMi4zCiAgICAgLy8gTm8gY29tcGVuc2F0 aW9uIGZvciBsYXRlbmN5IGFzIHRoYXQgaXMgbm90IHRlcnJpYmx5IGltcG9ydGFudCBpbiBwcmFj dGljZQogICAgIGRvdWJsZSBkYXRlVmFsdWUgPSBtX3Jlc3BvbnNlLmRhdGUoKTsKLSAgICBkb3Vi bGUgYXBwYXJlbnRBZ2UgPSBpc2Zpbml0ZShkYXRlVmFsdWUpID8gbWF4KDAuLCBtX3Jlc3BvbnNl VGltZXN0YW1wIC0gZGF0ZVZhbHVlKSA6IDA7CisgICAgZG91YmxlIGFwcGFyZW50QWdlID0gaXNm aW5pdGUoZGF0ZVZhbHVlKSA/IHN0ZDo6bWF4KDAuLCBtX3Jlc3BvbnNlVGltZXN0YW1wIC0gZGF0 ZVZhbHVlKSA6IDA7CiAgICAgZG91YmxlIGFnZVZhbHVlID0gbV9yZXNwb25zZS5hZ2UoKTsKLSAg ICBkb3VibGUgY29ycmVjdGVkUmVjZWl2ZWRBZ2UgPSBpc2Zpbml0ZShhZ2VWYWx1ZSkgPyBtYXgo YXBwYXJlbnRBZ2UsIGFnZVZhbHVlKSA6IGFwcGFyZW50QWdlOworICAgIGRvdWJsZSBjb3JyZWN0 ZWRSZWNlaXZlZEFnZSA9IGlzZmluaXRlKGFnZVZhbHVlKSA/IHN0ZDo6bWF4KGFwcGFyZW50QWdl LCBhZ2VWYWx1ZSkgOiBhcHBhcmVudEFnZTsKICAgICBkb3VibGUgcmVzaWRlbnRUaW1lID0gY3Vy cmVudFRpbWUoKSAtIG1fcmVzcG9uc2VUaW1lc3RhbXA7CiAgICAgcmV0dXJuIGNvcnJlY3RlZFJl Y2VpdmVkQWdlICsgcmVzaWRlbnRUaW1lOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vaW1hZ2UtZW5jb2RlcnMvc2tpYS9KUEVHSW1hZ2VFbmNvZGVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWVuY29kZXJzL3NraWEvSlBFR0ltYWdlRW5jb2Rlci5j cHAKaW5kZXggMjJkNTE0YWE3MjZkN2M3YTRlYjUzY2FhNGFhZWNhNWMwZTVmODg3Ni4uN2I3ZTQ1 YWVjMmY0NzMwYTIxM2FkZDY4Yjk0NThiNTAyODZjYjk2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW1hZ2UtZW5jb2RlcnMvc2tpYS9KUEVHSW1hZ2VFbmNvZGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1lbmNvZGVycy9za2lhL0pQRUdJbWFn ZUVuY29kZXIuY3BwCkBAIC0xNzMsOCArMTczLDkgQEAgc3RhdGljIGJvb2wgZW5jb2RlUGl4ZWxz KEludFNpemUgaW1hZ2VTaXplLCB1bnNpZ25lZCBjaGFyKiBpbnB1dFBpeGVscywgYm9vbCBwcmUK ICAgICByb3cucmVzaXplKGNpbmZvLmltYWdlX3dpZHRoICogY2luZm8uaW5wdXRfY29tcG9uZW50 cyk7CiAgICAgY29uc3Qgc2l6ZV90IHBpeGVsUm93U3RyaWRlID0gY2luZm8uaW1hZ2Vfd2lkdGgg KiA0OwogICAgIHdoaWxlIChjaW5mby5uZXh0X3NjYW5saW5lIDwgY2luZm8uaW1hZ2VfaGVpZ2h0 KSB7Ci0gICAgICAgIGV4dHJhY3RSb3dSR0IocGl4ZWxzLCBjaW5mby5pbWFnZV93aWR0aCwgcm93 LmRhdGEoKSk7Ci0gICAgICAgIGpwZWdfd3JpdGVfc2NhbmxpbmVzKCZjaW5mbywgcm93LmRhdGFT bG90KCksIDEpOworICAgICAgICBKU0FNUExFKiByb3dEYXRhID0gcm93LmRhdGEoKTsKKyAgICAg ICAgZXh0cmFjdFJvd1JHQihwaXhlbHMsIGNpbmZvLmltYWdlX3dpZHRoLCByb3dEYXRhKTsKKyAg ICAgICAganBlZ193cml0ZV9zY2FubGluZXMoJmNpbmZvLCAmcm93RGF0YSwgMSk7CiAgICAgICAg IHBpeGVscyArPSBwaXhlbFJvd1N0cmlkZTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0No YW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzM2ZkMDZjNGUzZTJjODRjNzRiZjk5NDA4 M2MzNWM5OWU0YjY1NDRkLi4yMzZiZTJlM2MxNTk5OGY4YzZlYTM1YTUwMjg3MTQ1ZTlkZDViMTJi IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTQgQEAKKzIwMTItMTAtMTcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxl LmNvbT4KKworICAgICAgICBDbGVhbiB1cCBWZWN0b3IuaAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTk2MjIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgUmV2ZXJzZWRQcm94eSB0ZXN0LgorCisg ICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvVmVjdG9yLmNwcDoKKwogMjAxMi0xMC0x NyAgSm9jaGVuIEVpc2luZ2VyICA8am9jaGVuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbZ3lw XSBmaXggYnVuZGxlIHJlc291cmNlcyBmb3IgRHVtcFJlbmRlclRyZWUgb24gbWFjCmRpZmYgLS1n aXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9WZWN0b3IuY3BwIGIvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XVEYvVmVjdG9yLmNwcAppbmRleCA0NmEzNTkyMmY2OWViZjc0MTBk MjQ0NjljOGUxZjhlZjBjZWMyYmI2Li45ZmZiMGIyZTg3ZGI0YzE5ZTAwZWE3NWEyYmY5YTE3M2Fj YzUxODJlIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9WZWN0b3Iu Y3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL1ZlY3Rvci5jcHAKQEAgLTc2 LDI5ICs3Niw0IEBAIFRFU1QoV1RGX1ZlY3RvciwgUmV2ZXJzZUl0ZXJhdG9yKQogICAgIEVYUEVD VF9UUlVFKGVuZCA9PSBpdCk7CiB9CiAKLVRFU1QoV1RGX1ZlY3RvciwgUmV2ZXJzZWRQcm94eSkK LXsKLSAgICBWZWN0b3I8aW50PiBpbnRWZWN0b3I7Ci0gICAgaW50VmVjdG9yLmFwcGVuZCgxMCk7 Ci0gICAgaW50VmVjdG9yLmFwcGVuZCgxMSk7Ci0gICAgaW50VmVjdG9yLmFwcGVuZCgxMik7Ci0g ICAgaW50VmVjdG9yLmFwcGVuZCgxMyk7Ci0gICAgCi0gICAgVmVjdG9yPGludD46OnJldmVyc2Vf aXRlcmF0b3IgaXQgPSBpbnRWZWN0b3IucmV2ZXJzZWQoKS5iZWdpbigpOwotICAgIFZlY3Rvcjxp bnQ+OjpyZXZlcnNlX2l0ZXJhdG9yIGVuZCA9IGludFZlY3Rvci5yZXZlcnNlZCgpLmVuZCgpOwot ICAgIAotICAgIEVYUEVDVF9UUlVFKGVuZCAhPSBpdCk7Ci0KLSAgICBFWFBFQ1RfRVEoMTMsICpp dCk7Ci0gICAgKytpdDsKLSAgICBFWFBFQ1RfRVEoMTIsICppdCk7Ci0gICAgKytpdDsKLSAgICBF WFBFQ1RfRVEoMTEsICppdCk7Ci0gICAgKytpdDsKLSAgICBFWFBFQ1RfRVEoMTAsICppdCk7Ci0g ICAgKytpdDsKLQotICAgIEVYUEVDVF9UUlVFKGVuZCA9PSBpdCk7Ci19Ci0KIH0gLy8gbmFtZXNw YWNlIFRlc3RXZWJLaXRBUEkK