95281 2012-08-28 21:12:03 -0700 Added JSScope::objectInScope(), and refactored callers to use it 2012-08-29 08:09:24 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren gustavo paroga philn xan.lopez oldest_to_newest 707064 0 ggaren 2012-08-28 21:12:03 -0700 Added JSScope::objectInScope(), and refactored callers to use it 707067 1 161131 ggaren 2012-08-28 21:22:32 -0700 Created attachment 161131 Patch 707078 2 161131 buildbot 2012-08-28 21:49:06 -0700 Comment on attachment 161131 Patch Attachment 161131 did not pass win-ews (win): Output: http://queues.webkit.org/results/13694056 707081 3 161131 webkit-ews 2012-08-28 21:56:31 -0700 Comment on attachment 161131 Patch Attachment 161131 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/13684048 707091 4 161134 ggaren 2012-08-28 22:10:46 -0700 Created attachment 161134 Patch 707135 5 161134 ggaren 2012-08-28 23:39:35 -0700 Comment on attachment 161134 Patch Clearing flags on attachment: 161134 Committed r126962: <http://trac.webkit.org/changeset/126962> 707136 6 ggaren 2012-08-28 23:39:38 -0700 All reviewed patches have been landed. Closing bug. 707325 7 paroga 2012-08-29 04:55:06 -0700 (In reply to comment #5) > (From update of attachment 161134 [details]) > Clearing flags on attachment: 161134 > > Committed r126962: <http://trac.webkit.org/changeset/126962> Committed build fix for !ENABLE(JIT) in r126990: <http://trac.webkit.org/changeset/126990> 707456 8 ggaren 2012-08-29 08:09:24 -0700 Thanks! 161131 2012-08-28 21:22:32 -0700 2012-08-28 22:10:44 -0700 Patch bug-95281-20120828212225.patch text/plain 14363 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTI2OTU1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDYyIEBA CisyMDExLTA4LTI4ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgQWRkZWQgSlNTY29wZTo6b2JqZWN0SW5TY29wZSgpLCBhbmQgcmVmYWN0b3JlZCBjYWxsZXJz IHRvIHVzZSBpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTUyODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGlzIGlzIGEgc3RlcCB0b3dhcmQgcmVtb3ZpbmcgU2NvcGVDaGFpbk5vZGUuIFdlIG5lZWQg YSBsYXllciBvZgorICAgICAgICBpbmRpcmVjdGlvbiBzbyB0aGF0ICd3aXRoJyBzY29wZXMgY2Fu IHByb3h5IGZvciBhbiBvYmplY3QuCisgICAgICAgIEpTU2NvcGU6Om9iamVjdEluU2NvcGUoKSB3 aWxsIGJlIHRoYXQgbGF5ZXIuCisKKyAgICAgICAgKiBieXRlY29kZS9FdmFsQ29kZUNhY2hlLmg6 CisgICAgICAgIChKU0M6OkV2YWxDb2RlQ2FjaGU6OnRyeUdldCk6CisgICAgICAgIChKU0M6OkV2 YWxDb2RlQ2FjaGU6OmdldFNsb3cpOgorICAgICAgICAqIGJ5dGVjb21waWxlci9CeXRlY29kZUdl bmVyYXRvci5jcHA6CisgICAgICAgIChKU0M6OkJ5dGVjb2RlR2VuZXJhdG9yOjpyZXNvbHZlKToK KyAgICAgICAgKEpTQzo6Qnl0ZWNvZGVHZW5lcmF0b3I6OnJlc29sdmVDb25zdERlY2wpOiAuIHZz IC0+CisKKyAgICAgICAgKiBpbnRlcnByZXRlci9JbnRlcnByZXRlci5jcHA6CisgICAgICAgIChK U0M6OkludGVycHJldGVyOjp1bndpbmRDYWxsRnJhbWUpOgorICAgICAgICAoSlNDOjpJbnRlcnBy ZXRlcjo6ZXhlY3V0ZSk6CisgICAgICAgICogcnVudGltZS9KU1Njb3BlLmNwcDoKKyAgICAgICAg KEpTQzo6SlNTY29wZTo6cmVzb2x2ZSk6CisgICAgICAgIChKU0M6OkpTU2NvcGU6OnJlc29sdmVT a2lwKToKKyAgICAgICAgKEpTQzo6SlNTY29wZTo6cmVzb2x2ZUdsb2JhbER5bmFtaWMpOgorICAg ICAgICAoSlNDOjpKU1Njb3BlOjpyZXNvbHZlQmFzZSk6CisgICAgICAgIChKU0M6OkpTU2NvcGU6 OnJlc29sdmVXaXRoQmFzZSk6CisgICAgICAgIChKU0M6OkpTU2NvcGU6OnJlc29sdmVXaXRoVGhp cyk6IEFkZGVkIEpTU2NvcGU6Om9iamVjdEF0U2NvcGUoKSBjYWxscy4KKworICAgICAgICAqIHJ1 bnRpbWUvSlNTY29wZS5oOgorICAgICAgICAoSlNTY29wZSk6CisgICAgICAgIChKU0M6OkpTU2Nv cGU6Om9iamVjdEF0U2NvcGUpOgorICAgICAgICAoSlNDKToKKyAgICAgICAgKFNjb3BlQ2hhaW5J dGVyYXRvcik6CisgICAgICAgIChKU0M6OlNjb3BlQ2hhaW5JdGVyYXRvcjo6U2NvcGVDaGFpbkl0 ZXJhdG9yKToKKyAgICAgICAgKEpTQzo6U2NvcGVDaGFpbkl0ZXJhdG9yOjpnZXQpOgorICAgICAg ICAoSlNDOjpTY29wZUNoYWluSXRlcmF0b3I6Om9wZXJhdG9yLT4pOgorICAgICAgICAoSlNDOjpT Y29wZUNoYWluSXRlcmF0b3I6Om9wZXJhdG9yKyspOgorICAgICAgICAoSlNDOjpTY29wZUNoYWlu SXRlcmF0b3I6Om9wZXJhdG9yPT0pOgorICAgICAgICAoSlNDOjpTY29wZUNoYWluSXRlcmF0b3I6 Om9wZXJhdG9yIT0pOgorICAgICAgICAoSlNDOjpTY29wZUNoYWluTm9kZTo6YmVnaW4pOgorICAg ICAgICAoSlNDOjpTY29wZUNoYWluTm9kZTo6ZW5kKTogSSBtb3ZlZCBTY29wZUNoYWluSXRlcmF0 b3IgdG8gdGhpcyBmaWxlCisgICAgICAgIHRvIHJlc29sdmUgYSBjaXJjdWxhciAjaW5jbHVkZSBw cm9ibGVtLiBFdmVudHVhbGx5LCBJJ2xsIHByb2JhYmx5IHJlbmFtZQorICAgICAgICBpdCB0byBK U1Njb3BlOjppdGVyYXRvciwgc28gSSB0aGluayBpdCBiZWxvbmdzIGhlcmUuCisKKyAgICAgICAg KiBydW50aW1lL1Njb3BlQ2hhaW4uY3BwOgorICAgICAgICAoSlNDOjpTY29wZUNoYWluTm9kZTo6 cHJpbnQpOgorICAgICAgICAoSlNDOjpTY29wZUNoYWluTm9kZTo6bG9jYWxEZXB0aCk6IC4gdnMg LT4KKworICAgICAgICAqIHJ1bnRpbWUvU2NvcGVDaGFpbi5oOgorICAgICAgICAoU2NvcGVDaGFp bk5vZGUpOiBJIG1hZGUgdGhlICdvYmplY3QnIGRhdGEgbWVtYmVyIHByaXZhdGUgYmVjYXVzZSBp dCdzCisgICAgICAgIG5vIGxvbmdlciBzYWZlIHRvIGFjY2VzcyAtLSB5b3UgbmVlZCB0byBjYWxs IEpTU2NvcGU6Om9iamVjdEF0U2NvcGUoKQorICAgICAgICBpbnN0ZWFkLgorCisgICAgICAgIFRo ZSBKSVRzIG5lZWQgdG8gYmUgZnJpZW5kcyBiZWNhdXNlIG9mIHRoZSBwcml2YXRlIGRlY2xhcmF0 aW9uLgorCisgICAgICAgIFN1YnRseSwgSklUL0xMSW50IGNvZGUgaXMgY29ycmVjdCB3aXRob3V0 IGFueSBjaGFuZ2VzIGJlY2F1c2UgSklUL0xMSW50CisgICAgICAgIGNvZGUgbmV2ZXIgY29tcGls ZXMgZGlyZWN0IGFjY2VzcyB0byBhIHdpdGggc2NvcGUuCisKIDIwMTItMDgtMjggIE1hcmsgTGFt ICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZGluZyBzdXBwb3J0IGZvciBhZGRp bmcgTExJbnQgb3Bjb2RlIGV4dGVuc2lvbnMuICBUaGlzIHdpbGwgYmUgbmVlZGVkCkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvRXZhbENvZGVDYWNoZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9FdmFsQ29kZUNhY2hlLmgJKHJldmlz aW9uIDEyNjkwOCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9FdmFsQ29kZUNh Y2hlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDcgKzQ3LDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAg ICAgcHVibGljOgogICAgICAgICBFdmFsRXhlY3V0YWJsZSogdHJ5R2V0KGJvb2wgaW5TdHJpY3RD b250ZXh0LCBjb25zdCBVU3RyaW5nJiBldmFsU291cmNlLCBTY29wZUNoYWluTm9kZSogc2NvcGVD aGFpbikKICAgICAgICAgewotICAgICAgICAgICAgaWYgKCFpblN0cmljdENvbnRleHQgJiYgZXZh bFNvdXJjZS5sZW5ndGgoKSA8IG1heENhY2hlYWJsZVNvdXJjZUxlbmd0aCAmJiAoKnNjb3BlQ2hh aW4tPmJlZ2luKCkpLT5pc1ZhcmlhYmxlT2JqZWN0KCkpCisgICAgICAgICAgICBpZiAoIWluU3Ry aWN0Q29udGV4dCAmJiBldmFsU291cmNlLmxlbmd0aCgpIDwgbWF4Q2FjaGVhYmxlU291cmNlTGVu Z3RoICYmIHNjb3BlQ2hhaW4tPmJlZ2luKCktPmlzVmFyaWFibGVPYmplY3QoKSkKICAgICAgICAg ICAgICAgICByZXR1cm4gbV9jYWNoZU1hcC5nZXQoZXZhbFNvdXJjZS5pbXBsKCkpLmdldCgpOwog ICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgIH0KQEAgLTU5LDcgKzU5LDcgQEAgbmFtZXNw YWNlIEpTQyB7CiAgICAgICAgICAgICBpZiAoZXhjZXB0aW9uVmFsdWUpCiAgICAgICAgICAgICAg ICAgcmV0dXJuIDA7CiAgICAgICAgICAgICAKLSAgICAgICAgICAgIGlmICghaW5TdHJpY3RDb250 ZXh0ICYmIGV2YWxTb3VyY2UubGVuZ3RoKCkgPCBtYXhDYWNoZWFibGVTb3VyY2VMZW5ndGggJiYg KCpzY29wZUNoYWluLT5iZWdpbigpKS0+aXNWYXJpYWJsZU9iamVjdCgpICYmIG1fY2FjaGVNYXAu c2l6ZSgpIDwgbWF4Q2FjaGVFbnRyaWVzKQorICAgICAgICAgICAgaWYgKCFpblN0cmljdENvbnRl eHQgJiYgZXZhbFNvdXJjZS5sZW5ndGgoKSA8IG1heENhY2hlYWJsZVNvdXJjZUxlbmd0aCAmJiBz Y29wZUNoYWluLT5iZWdpbigpLT5pc1ZhcmlhYmxlT2JqZWN0KCkgJiYgbV9jYWNoZU1hcC5zaXpl KCkgPCBtYXhDYWNoZUVudHJpZXMpCiAgICAgICAgICAgICAgICAgbV9jYWNoZU1hcC5zZXQoZXZh bFNvdXJjZS5pbXBsKCksIFdyaXRlQmFycmllcjxFdmFsRXhlY3V0YWJsZT4oZXhlYy0+Z2xvYmFs RGF0YSgpLCBvd25lciwgZXZhbEV4ZWN1dGFibGUpKTsKICAgICAgICAgICAgIAogICAgICAgICAg ICAgcmV0dXJuIGV2YWxFeGVjdXRhYmxlOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5 dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHAJKHJldmlzaW9u IDEyNjkwOCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVH ZW5lcmF0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjcyLDcgKzEyNzIsNyBAQCBSZXNvbHZl UmVzdWx0IEJ5dGVjb2RlR2VuZXJhdG9yOjpyZXNvbHZlCiAgICAgc2l6ZV90IGRlcHRoT2ZGaXJz dFNjb3BlV2l0aER5bmFtaWNDaGVja3MgPSAwOwogICAgIHVuc2lnbmVkIGZsYWdzID0gMDsKICAg ICBmb3IgKDsgaXRlciAhPSBlbmQ7ICsraXRlciwgKytkZXB0aCkgewotICAgICAgICBKU09iamVj dCogY3VycmVudFNjb3BlID0gaXRlci0+Z2V0KCk7CisgICAgICAgIEpTT2JqZWN0KiBjdXJyZW50 U2NvcGUgPSBpdGVyLmdldCgpOwogICAgICAgICBpZiAoIWN1cnJlbnRTY29wZS0+aXNWYXJpYWJs ZU9iamVjdCgpKSB7CiAgICAgICAgICAgICBmbGFncyB8PSBSZXNvbHZlUmVzdWx0OjpEeW5hbWlj RmxhZzsKICAgICAgICAgICAgIGJyZWFrOwpAQCAtMTMxMCw3ICsxMzEwLDcgQEAgUmVzb2x2ZVJl c3VsdCBCeXRlY29kZUdlbmVyYXRvcjo6cmVzb2x2ZQogICAgIH0KIAogICAgIC8vIENhbid0IGxv Y2F0ZSB0aGUgcHJvcGVydHkgYnV0IHdlJ3JlIGFibGUgdG8gYXZvaWQgYSBmZXcgbG9va3Vwcy4K LSAgICBKU09iamVjdCogc2NvcGUgPSBpdGVyLT5nZXQoKTsKKyAgICBKU09iamVjdCogc2NvcGUg PSBpdGVyLmdldCgpOwogICAgIC8vIFN0ZXAgb3ZlciB0aGUgZnVuY3Rpb24ncyBhY3RpdmF0aW9u LCBpZiBpdCBuZWVkcyBvbmUuIEF0IHRoaXMgcG9pbnQgd2UKICAgICAvLyBrbm93IHRoZXJlIGlz IG5vIGR5bmFtaWMgc2NvcGUgaW4gdGhlIGZ1bmN0aW9uIGl0c2VsZiwgc28gdGhpcyBpcyBzYWZl IHRvCiAgICAgLy8gZG8uCkBAIC0xMzQxLDcgKzEzNDEsNyBAQCBSZXNvbHZlUmVzdWx0IEJ5dGVj b2RlR2VuZXJhdG9yOjpyZXNvbHZlCiAgICAgU2NvcGVDaGFpbkl0ZXJhdG9yIGVuZCA9IHNjb3Bl Q2hhaW4oKS0+ZW5kKCk7CiAgICAgc2l6ZV90IGRlcHRoID0gMDsKICAgICBmb3IgKDsgaXRlciAh PSBlbmQ7ICsraXRlciwgKytkZXB0aCkgewotICAgICAgICBKU09iamVjdCogY3VycmVudFNjb3Bl ID0gaXRlci0+Z2V0KCk7CisgICAgICAgIEpTT2JqZWN0KiBjdXJyZW50U2NvcGUgPSBpdGVyLmdl dCgpOwogICAgICAgICBpZiAoIWN1cnJlbnRTY29wZS0+aXNWYXJpYWJsZU9iamVjdCgpKQogICAg ICAgICAgICAgY29udGludWU7CiAgICAgICAgIEpTU3ltYm9sVGFibGVPYmplY3QqIGN1cnJlbnRW YXJpYWJsZU9iamVjdCA9IGpzQ2FzdDxKU1N5bWJvbFRhYmxlT2JqZWN0Kj4oY3VycmVudFNjb3Bl KTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVy cHJldGVyLmNwcAkocmV2aXNpb24gMTI2OTA4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2lu dGVycHJldGVyL0ludGVycHJldGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDY1LDExICs0NjUs MTEgQEAgTkVWRVJfSU5MSU5FIGJvb2wgSW50ZXJwcmV0ZXI6OnVud2luZENhbAogICAgICAgICAg ICAgb2xkQ29kZUJsb2NrLT5jcmVhdGVBY3RpdmF0aW9uKGNhbGxGcmFtZSk7CiAgICAgICAgICAg ICBzY29wZUNoYWluID0gY2FsbEZyYW1lLT5zY29wZUNoYWluKCk7CiAgICAgICAgIH0KLSAgICAg ICAgd2hpbGUgKCFzY29wZUNoYWluLT5vYmplY3QtPmluaGVyaXRzKCZKU0FjdGl2YXRpb246OnNf aW5mbykpCisgICAgICAgIHdoaWxlICghSlNTY29wZTo6b2JqZWN0QXRTY29wZShzY29wZUNoYWlu KS0+aW5oZXJpdHMoJkpTQWN0aXZhdGlvbjo6c19pbmZvKSkKICAgICAgICAgICAgIHNjb3BlQ2hh aW4gPSBzY29wZUNoYWluLT5wb3AoKTsKIAogICAgICAgICBjYWxsRnJhbWUtPnNldFNjb3BlQ2hh aW4oc2NvcGVDaGFpbik7Ci0gICAgICAgIEpTQWN0aXZhdGlvbiogYWN0aXZhdGlvbiA9IGFzQWN0 aXZhdGlvbihzY29wZUNoYWluLT5vYmplY3QuZ2V0KCkpOworICAgICAgICBKU0FjdGl2YXRpb24q IGFjdGl2YXRpb24gPSBhc0FjdGl2YXRpb24oSlNTY29wZTo6b2JqZWN0QXRTY29wZShzY29wZUNo YWluKSk7CiAgICAgICAgIGFjdGl2YXRpb24tPnRlYXJPZmYoKnNjb3BlQ2hhaW4tPmdsb2JhbERh dGEpOwogICAgICAgICBpZiAoSlNWYWx1ZSBhcmd1bWVudHMgPSBjYWxsRnJhbWUtPnVuY2hlY2tl ZFIodW5tb2RpZmllZEFyZ3VtZW50c1JlZ2lzdGVyKG9sZENvZGVCbG9jay0+YXJndW1lbnRzUmVn aXN0ZXIoKSkpLmpzVmFsdWUoKSkKICAgICAgICAgICAgIGFzQXJndW1lbnRzKGFyZ3VtZW50cykt PmRpZFRlYXJPZmZBY3RpdmF0aW9uKGNhbGxGcmFtZS0+Z2xvYmFsRGF0YSgpLCBhY3RpdmF0aW9u KTsKQEAgLTEyODUsOCArMTI4NSw4IEBAIEpTVmFsdWUgSW50ZXJwcmV0ZXI6OmV4ZWN1dGUoRXZh bEV4ZWN1dGEKICAgICBKU09iamVjdCogdmFyaWFibGVPYmplY3Q7CiAgICAgZm9yIChTY29wZUNo YWluTm9kZSogbm9kZSA9IHNjb3BlQ2hhaW47IDsgbm9kZSA9IG5vZGUtPm5leHQuZ2V0KCkpIHsK ICAgICAgICAgQVNTRVJUKG5vZGUpOwotICAgICAgICBpZiAobm9kZS0+b2JqZWN0LT5pc1Zhcmlh YmxlT2JqZWN0KCkgJiYgIW5vZGUtPm9iamVjdC0+aXNOYW1lU2NvcGVPYmplY3QoKSkgewotICAg ICAgICAgICAgdmFyaWFibGVPYmplY3QgPSBqc0Nhc3Q8SlNTeW1ib2xUYWJsZU9iamVjdCo+KG5v ZGUtPm9iamVjdC5nZXQoKSk7CisgICAgICAgIGlmIChKU1Njb3BlOjpvYmplY3RBdFNjb3BlKG5v ZGUpLT5pc1ZhcmlhYmxlT2JqZWN0KCkgJiYgIUpTU2NvcGU6Om9iamVjdEF0U2NvcGUobm9kZSkt PmlzTmFtZVNjb3BlT2JqZWN0KCkpIHsKKyAgICAgICAgICAgIHZhcmlhYmxlT2JqZWN0ID0ganND YXN0PEpTU3ltYm9sVGFibGVPYmplY3QqPihKU1Njb3BlOjpvYmplY3RBdFNjb3BlKG5vZGUpKTsK ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgfQpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvSlNTY29wZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvSlNTY29wZS5jcHAJKHJldmlzaW9uIDEyNjkwOCkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTU2NvcGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01 Nyw3ICs1Nyw3IEBAIEpTVmFsdWUgSlNTY29wZTo6cmVzb2x2ZShDYWxsRnJhbWUqIGNhbGwKICAg ICBBU1NFUlQoc2NvcGVDaGFpbik7CiAKICAgICBkbyB7Ci0gICAgICAgIEpTT2JqZWN0KiBzY29w ZSA9IHNjb3BlQ2hhaW4tPm9iamVjdC5nZXQoKTsKKyAgICAgICAgSlNPYmplY3QqIHNjb3BlID0g SlNTY29wZTo6b2JqZWN0QXRTY29wZShzY29wZUNoYWluKTsKICAgICAgICAgUHJvcGVydHlTbG90 IHNsb3Qoc2NvcGUpOwogICAgICAgICBpZiAoc2NvcGUtPmdldFByb3BlcnR5U2xvdChjYWxsRnJh bWUsIGlkZW50aWZpZXIsIHNsb3QpKQogICAgICAgICAgICAgcmV0dXJuIHNsb3QuZ2V0VmFsdWUo Y2FsbEZyYW1lLCBpZGVudGlmaWVyKTsKQEAgLTg1LDcgKzg1LDcgQEAgSlNWYWx1ZSBKU1Njb3Bl OjpyZXNvbHZlU2tpcChDYWxsRnJhbWUqIAogICAgIH0KIAogICAgIGRvIHsKLSAgICAgICAgSlNP YmplY3QqIHNjb3BlID0gc2NvcGVDaGFpbi0+b2JqZWN0LmdldCgpOworICAgICAgICBKU09iamVj dCogc2NvcGUgPSBKU1Njb3BlOjpvYmplY3RBdFNjb3BlKHNjb3BlQ2hhaW4pOwogICAgICAgICBQ cm9wZXJ0eVNsb3Qgc2xvdChzY29wZSk7CiAgICAgICAgIGlmIChzY29wZS0+Z2V0UHJvcGVydHlT bG90KGNhbGxGcmFtZSwgaWRlbnRpZmllciwgc2xvdCkpCiAgICAgICAgICAgICByZXR1cm4gc2xv dC5nZXRWYWx1ZShjYWxsRnJhbWUsIGlkZW50aWZpZXIpOwpAQCAtMTQwLDcgKzE0MCw3IEBAIEpT VmFsdWUgSlNTY29wZTo6cmVzb2x2ZUdsb2JhbER5bmFtaWMoCiAgICAgICAgICAgICBzY29wZUNo YWluID0gc2NvcGVDaGFpbi0+bmV4dC5nZXQoKTsKICAgICB9CiAgICAgd2hpbGUgKHNraXAtLSkg ewotICAgICAgICBKU09iamVjdCogc2NvcGUgPSBzY29wZUNoYWluLT5vYmplY3QuZ2V0KCk7Cisg ICAgICAgIEpTT2JqZWN0KiBzY29wZSA9IEpTU2NvcGU6Om9iamVjdEF0U2NvcGUoc2NvcGVDaGFp bik7CiAgICAgICAgIGlmICghc2NvcGUtPmhhc0N1c3RvbVByb3BlcnRpZXMoKSkKICAgICAgICAg ICAgIGNvbnRpbnVlOwogCkBAIC0xNjMsNyArMTYzLDcgQEAgSlNWYWx1ZSBKU1Njb3BlOjpyZXNv bHZlQmFzZShDYWxsRnJhbWUqIAogICAgIEFTU0VSVChzY29wZUNoYWluKTsKIAogICAgIGRvIHsK LSAgICAgICAgSlNPYmplY3QqIHNjb3BlID0gc2NvcGVDaGFpbi0+b2JqZWN0LmdldCgpOworICAg ICAgICBKU09iamVjdCogc2NvcGUgPSBKU1Njb3BlOjpvYmplY3RBdFNjb3BlKHNjb3BlQ2hhaW4p OwogCiAgICAgICAgIFByb3BlcnR5U2xvdCBzbG90KHNjb3BlKTsKICAgICAgICAgaWYgKCFzY29w ZS0+Z2V0UHJvcGVydHlTbG90KGNhbGxGcmFtZSwgaWRlbnRpZmllciwgc2xvdCkpCkBAIC0xODQs NyArMTg0LDcgQEAgSlNWYWx1ZSBKU1Njb3BlOjpyZXNvbHZlV2l0aEJhc2UoQ2FsbEZyYQogICAg IEFTU0VSVChzY29wZUNoYWluKTsKIAogICAgIGRvIHsKLSAgICAgICAgSlNPYmplY3QqIHNjb3Bl ID0gc2NvcGVDaGFpbi0+b2JqZWN0LmdldCgpOworICAgICAgICBKU09iamVjdCogc2NvcGUgPSBK U1Njb3BlOjpvYmplY3RBdFNjb3BlKHNjb3BlQ2hhaW4pOwogCiAgICAgICAgIFByb3BlcnR5U2xv dCBzbG90KHNjb3BlKTsKICAgICAgICAgaWYgKCFzY29wZS0+Z2V0UHJvcGVydHlTbG90KGNhbGxG cmFtZSwgaWRlbnRpZmllciwgc2xvdCkpCkBAIC0yMDcsNyArMjA3LDcgQEAgSlNWYWx1ZSBKU1Nj b3BlOjpyZXNvbHZlV2l0aFRoaXMoQ2FsbEZyYQogICAgIEFTU0VSVChzY29wZUNoYWluKTsKIAog ICAgIGRvIHsKLSAgICAgICAgSlNPYmplY3QqIHNjb3BlID0gc2NvcGVDaGFpbi0+b2JqZWN0Lmdl dCgpOworICAgICAgICBKU09iamVjdCogc2NvcGUgPSBKU1Njb3BlOjpvYmplY3RBdFNjb3BlKHNj b3BlQ2hhaW4pOwogCiAgICAgICAgIFByb3BlcnR5U2xvdCBzbG90KHNjb3BlKTsKICAgICAgICAg aWYgKCFzY29wZS0+Z2V0UHJvcGVydHlTbG90KGNhbGxGcmFtZSwgaWRlbnRpZmllciwgc2xvdCkp CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU1Njb3BlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNTY29wZS5oCShyZXZpc2lvbiAx MjY5MDgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU1Njb3BlLmgJKHdvcmtp bmcgY29weSkKQEAgLTM0LDYgKzM0LDggQEAgY2xhc3MgSlNTY29wZSA6IHB1YmxpYyBKU05vbkZp bmFsT2JqZWN0IAogcHVibGljOgogICAgIHR5cGVkZWYgSlNOb25GaW5hbE9iamVjdCBCYXNlOwog CisgICAgc3RhdGljIEpTT2JqZWN0KiBvYmplY3RBdFNjb3BlKFNjb3BlQ2hhaW5Ob2RlKik7CisK ICAgICBzdGF0aWMgSlNWYWx1ZSByZXNvbHZlKENhbGxGcmFtZSosIGNvbnN0IElkZW50aWZpZXIm KTsKICAgICBzdGF0aWMgSlNWYWx1ZSByZXNvbHZlU2tpcChDYWxsRnJhbWUqLCBjb25zdCBJZGVu dGlmaWVyJiwgaW50IHNraXApOwogICAgIHN0YXRpYyBKU1ZhbHVlIHJlc29sdmVHbG9iYWwoCkBA IC02NSw2ICs2Nyw0MiBAQCBpbmxpbmUgSlNTY29wZTo6SlNTY29wZShKU0dsb2JhbERhdGEmIGds CiB7CiB9CiAKK2lubGluZSBKU09iamVjdCogSlNTY29wZTo6b2JqZWN0QXRTY29wZShTY29wZUNo YWluTm9kZSogc2NvcGVDaGFpbikKK3sKKyAgICByZXR1cm4gc2NvcGVDaGFpbi0+b2JqZWN0Lmdl dCgpOworfQorCitjbGFzcyBTY29wZUNoYWluSXRlcmF0b3IgeworcHVibGljOgorICAgIFNjb3Bl Q2hhaW5JdGVyYXRvcihTY29wZUNoYWluTm9kZSogbm9kZSkKKyAgICAgICAgOiBtX25vZGUobm9k ZSkKKyAgICB7CisgICAgfQorCisgICAgSlNPYmplY3QqIGdldCgpIGNvbnN0IHsgcmV0dXJuIEpT U2NvcGU6Om9iamVjdEF0U2NvcGUobV9ub2RlKTsgfQorICAgIEpTT2JqZWN0KiBvcGVyYXRvci0+ KCkgY29uc3QgeyByZXR1cm4gSlNTY29wZTo6b2JqZWN0QXRTY29wZShtX25vZGUpOyB9CisKKyAg ICBTY29wZUNoYWluSXRlcmF0b3ImIG9wZXJhdG9yKysoKSB7IG1fbm9kZSA9IG1fbm9kZS0+bmV4 dC5nZXQoKTsgcmV0dXJuICp0aGlzOyB9CisKKyAgICAvLyBwb3N0Zml4ICsrIGludGVudGlvbmFs bHkgb21pdHRlZAorCisgICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IFNjb3BlQ2hhaW5JdGVyYXRv ciYgb3RoZXIpIGNvbnN0IHsgcmV0dXJuIG1fbm9kZSA9PSBvdGhlci5tX25vZGU7IH0KKyAgICBi b29sIG9wZXJhdG9yIT0oY29uc3QgU2NvcGVDaGFpbkl0ZXJhdG9yJiBvdGhlcikgY29uc3QgeyBy ZXR1cm4gbV9ub2RlICE9IG90aGVyLm1fbm9kZTsgfQorCitwcml2YXRlOgorICAgIFNjb3BlQ2hh aW5Ob2RlKiBtX25vZGU7Cit9OworCitpbmxpbmUgU2NvcGVDaGFpbkl0ZXJhdG9yIFNjb3BlQ2hh aW5Ob2RlOjpiZWdpbigpCit7CisgICAgcmV0dXJuIFNjb3BlQ2hhaW5JdGVyYXRvcih0aGlzKTsg Cit9CisKK2lubGluZSBTY29wZUNoYWluSXRlcmF0b3IgU2NvcGVDaGFpbk5vZGU6OmVuZCgpCit7 IAorICAgIHJldHVybiBTY29wZUNoYWluSXRlcmF0b3IoMCk7IAorfQorCiB9IC8vIG5hbWVzcGFj ZSBKU0MKIAogI2VuZGlmIC8vIEpTU2NvcGVfaApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvU2NvcGVDaGFpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvU2NvcGVDaGFpbi5jcHAJKHJldmlzaW9uIDEyNjkwOCkKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL1Njb3BlQ2hhaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z Nyw3ICszNyw3IEBAIHZvaWQgU2NvcGVDaGFpbk5vZGU6OnByaW50KCkKIHsKICAgICBTY29wZUNo YWluSXRlcmF0b3Igc2NvcGVFbmQgPSBlbmQoKTsKICAgICBmb3IgKFNjb3BlQ2hhaW5JdGVyYXRv ciBzY29wZUl0ZXIgPSBiZWdpbigpOyBzY29wZUl0ZXIgIT0gc2NvcGVFbmQ7ICsrc2NvcGVJdGVy KSB7Ci0gICAgICAgIEpTT2JqZWN0KiBvID0gc2NvcGVJdGVyLT5nZXQoKTsKKyAgICAgICAgSlNP YmplY3QqIG8gPSBzY29wZUl0ZXIuZ2V0KCk7CiAgICAgICAgIFByb3BlcnR5TmFtZUFycmF5IHBy b3BlcnR5TmFtZXMoZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCkpOwogICAgICAgICBvLT5tZXRo b2RUYWJsZSgpLT5nZXRQcm9wZXJ0eU5hbWVzKG8sIGdsb2JhbE9iamVjdC0+Z2xvYmFsRXhlYygp LCBwcm9wZXJ0eU5hbWVzLCBFeGNsdWRlRG9udEVudW1Qcm9wZXJ0aWVzKTsKICAgICAgICAgUHJv cGVydHlOYW1lQXJyYXk6OmNvbnN0X2l0ZXJhdG9yIHByb3BFbmQgPSBwcm9wZXJ0eU5hbWVzLmVu ZCgpOwpAQCAtNjAsNyArNjAsNyBAQCBpbnQgU2NvcGVDaGFpbk5vZGU6OmxvY2FsRGVwdGgoKQog ICAgIGludCBzY29wZURlcHRoID0gMDsKICAgICBTY29wZUNoYWluSXRlcmF0b3IgaXRlciA9IHRo aXMtPmJlZ2luKCk7CiAgICAgU2NvcGVDaGFpbkl0ZXJhdG9yIGVuZCA9IHRoaXMtPmVuZCgpOwot ICAgIHdoaWxlICghKCppdGVyKS0+aW5oZXJpdHMoJkpTQWN0aXZhdGlvbjo6c19pbmZvKSkgewor ICAgIHdoaWxlICghaXRlci0+aW5oZXJpdHMoJkpTQWN0aXZhdGlvbjo6c19pbmZvKSkgewogICAg ICAgICArK2l0ZXI7CiAgICAgICAgIGlmIChpdGVyID09IGVuZCkKICAgICAgICAgICAgIGJyZWFr OwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU2NvcGVDaGFpbi5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Njb3BlQ2hhaW4uaAkocmV2 aXNpb24gMTI2OTA4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU2NvcGVDaGFp bi5oCSh3b3JraW5nIGNvcHkpCkBAIC03MSw3ICs3MSw5IEBAIG5hbWVzcGFjZSBKU0MgewogICAg ICAgICAKICAgICAgICAgSlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRhOwogICAgICAgICBXcml0ZUJh cnJpZXI8U2NvcGVDaGFpbk5vZGU+IG5leHQ7CisgICAgcHJpdmF0ZToKICAgICAgICAgV3JpdGVC YXJyaWVyPEpTT2JqZWN0PiBvYmplY3Q7CisgICAgcHVibGljOgogICAgICAgICBXcml0ZUJhcnJp ZXI8SlNHbG9iYWxPYmplY3Q+IGdsb2JhbE9iamVjdDsKICAgICAgICAgV3JpdGVCYXJyaWVyPEpT T2JqZWN0PiBnbG9iYWxUaGlzOwogCkBAIC05Myw2ICs5NSwxMCBAQCBuYW1lc3BhY2UgSlNDIHsK IAogICAgIHByaXZhdGU6CiAgICAgICAgIGZyaWVuZCBjbGFzcyBMTEludE9mZnNldHNFeHRyYWN0 b3I7CisgICAgICAgIGZyaWVuZCBjbGFzcyBTY29wZUNoYWluSXRlcmF0b3I7CisgICAgICAgIGZy aWVuZCBjbGFzcyBKU1Njb3BlOworICAgICAgICBmcmllbmQgY2xhc3MgREZHOjpTcGVjdWxhdGl2 ZUpJVDsKKyAgICAgICAgZnJpZW5kIGNsYXNzIEpJVDsKICAgICAgICAgCiAgICAgICAgIHN0YXRp YyBjb25zdCB1bnNpZ25lZCBTdHJ1Y3R1cmVGbGFncyA9IE92ZXJyaWRlc1Zpc2l0Q2hpbGRyZW47 CiAgICAgfTsKQEAgLTEwOSwzNyArMTE1LDYgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHJl dHVybiBuZXh0LmdldCgpOwogICAgIH0KIAotICAgIGNsYXNzIFNjb3BlQ2hhaW5JdGVyYXRvciB7 Ci0gICAgcHVibGljOgotICAgICAgICBTY29wZUNoYWluSXRlcmF0b3IoU2NvcGVDaGFpbk5vZGUq IG5vZGUpCi0gICAgICAgICAgICA6IG1fbm9kZShub2RlKQotICAgICAgICB7Ci0gICAgICAgIH0K LQotICAgICAgICBXcml0ZUJhcnJpZXI8SlNPYmplY3Q+IGNvbnN0ICYgb3BlcmF0b3IqKCkgY29u c3QgeyByZXR1cm4gbV9ub2RlLT5vYmplY3Q7IH0KLSAgICAgICAgV3JpdGVCYXJyaWVyPEpTT2Jq ZWN0PiBjb25zdCAqIG9wZXJhdG9yLT4oKSBjb25zdCB7IHJldHVybiAmKG9wZXJhdG9yKigpKTsg fQotICAgIAotICAgICAgICBTY29wZUNoYWluSXRlcmF0b3ImIG9wZXJhdG9yKysoKSB7IG1fbm9k ZSA9IG1fbm9kZS0+bmV4dC5nZXQoKTsgcmV0dXJuICp0aGlzOyB9Ci0KLSAgICAgICAgLy8gcG9z dGZpeCArKyBpbnRlbnRpb25hbGx5IG9taXR0ZWQKLQotICAgICAgICBib29sIG9wZXJhdG9yPT0o Y29uc3QgU2NvcGVDaGFpbkl0ZXJhdG9yJiBvdGhlcikgY29uc3QgeyByZXR1cm4gbV9ub2RlID09 IG90aGVyLm1fbm9kZTsgfQotICAgICAgICBib29sIG9wZXJhdG9yIT0oY29uc3QgU2NvcGVDaGFp bkl0ZXJhdG9yJiBvdGhlcikgY29uc3QgeyByZXR1cm4gbV9ub2RlICE9IG90aGVyLm1fbm9kZTsg fQotCi0gICAgcHJpdmF0ZToKLSAgICAgICAgU2NvcGVDaGFpbk5vZGUqIG1fbm9kZTsKLSAgICB9 OwotCi0gICAgaW5saW5lIFNjb3BlQ2hhaW5JdGVyYXRvciBTY29wZUNoYWluTm9kZTo6YmVnaW4o KQotICAgIHsKLSAgICAgICAgcmV0dXJuIFNjb3BlQ2hhaW5JdGVyYXRvcih0aGlzKTsgCi0gICAg fQotCi0gICAgaW5saW5lIFNjb3BlQ2hhaW5JdGVyYXRvciBTY29wZUNoYWluTm9kZTo6ZW5kKCkK LSAgICB7IAotICAgICAgICByZXR1cm4gU2NvcGVDaGFpbkl0ZXJhdG9yKDApOyAKLSAgICB9Ci0K ICAgICBBTFdBWVNfSU5MSU5FIEpTR2xvYmFsRGF0YSYgRXhlY1N0YXRlOjpnbG9iYWxEYXRhKCkg Y29uc3QKICAgICB7CiAgICAgICAgIEFTU0VSVChzY29wZUNoYWluKCktPmdsb2JhbERhdGEpOwo= 161134 2012-08-28 22:10:46 -0700 2012-08-28 23:39:35 -0700 Patch bug-95281-20120828221037.patch text/plain 17399 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTI2OTU2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDYyIEBA CisyMDEyLTA4LTI4ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgQWRkZWQgSlNTY29wZTo6b2JqZWN0SW5TY29wZSgpLCBhbmQgcmVmYWN0b3JlZCBjYWxsZXJz IHRvIHVzZSBpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTUyODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGlzIGlzIGEgc3RlcCB0b3dhcmQgcmVtb3ZpbmcgU2NvcGVDaGFpbk5vZGUuIFdlIG5lZWQg YSBsYXllciBvZgorICAgICAgICBpbmRpcmVjdGlvbiBzbyB0aGF0ICd3aXRoJyBzY29wZXMgY2Fu IHByb3h5IGZvciBhbiBvYmplY3QuCisgICAgICAgIEpTU2NvcGU6Om9iamVjdEluU2NvcGUoKSB3 aWxsIGJlIHRoYXQgbGF5ZXIuCisKKyAgICAgICAgKiBieXRlY29kZS9FdmFsQ29kZUNhY2hlLmg6 CisgICAgICAgIChKU0M6OkV2YWxDb2RlQ2FjaGU6OnRyeUdldCk6CisgICAgICAgIChKU0M6OkV2 YWxDb2RlQ2FjaGU6OmdldFNsb3cpOgorICAgICAgICAqIGJ5dGVjb21waWxlci9CeXRlY29kZUdl bmVyYXRvci5jcHA6CisgICAgICAgIChKU0M6OkJ5dGVjb2RlR2VuZXJhdG9yOjpyZXNvbHZlKToK KyAgICAgICAgKEpTQzo6Qnl0ZWNvZGVHZW5lcmF0b3I6OnJlc29sdmVDb25zdERlY2wpOiAuIHZz IC0+CisKKyAgICAgICAgKiBpbnRlcnByZXRlci9JbnRlcnByZXRlci5jcHA6CisgICAgICAgIChK U0M6OkludGVycHJldGVyOjp1bndpbmRDYWxsRnJhbWUpOgorICAgICAgICAoSlNDOjpJbnRlcnBy ZXRlcjo6ZXhlY3V0ZSk6CisgICAgICAgICogcnVudGltZS9KU1Njb3BlLmNwcDoKKyAgICAgICAg KEpTQzo6SlNTY29wZTo6cmVzb2x2ZSk6CisgICAgICAgIChKU0M6OkpTU2NvcGU6OnJlc29sdmVT a2lwKToKKyAgICAgICAgKEpTQzo6SlNTY29wZTo6cmVzb2x2ZUdsb2JhbER5bmFtaWMpOgorICAg ICAgICAoSlNDOjpKU1Njb3BlOjpyZXNvbHZlQmFzZSk6CisgICAgICAgIChKU0M6OkpTU2NvcGU6 OnJlc29sdmVXaXRoQmFzZSk6CisgICAgICAgIChKU0M6OkpTU2NvcGU6OnJlc29sdmVXaXRoVGhp cyk6IEFkZGVkIEpTU2NvcGU6Om9iamVjdEF0U2NvcGUoKSBjYWxscy4KKworICAgICAgICAqIHJ1 bnRpbWUvSlNTY29wZS5oOgorICAgICAgICAoSlNTY29wZSk6CisgICAgICAgIChKU0M6OkpTU2Nv cGU6Om9iamVjdEF0U2NvcGUpOgorICAgICAgICAoSlNDKToKKyAgICAgICAgKFNjb3BlQ2hhaW5J dGVyYXRvcik6CisgICAgICAgIChKU0M6OlNjb3BlQ2hhaW5JdGVyYXRvcjo6U2NvcGVDaGFpbkl0 ZXJhdG9yKToKKyAgICAgICAgKEpTQzo6U2NvcGVDaGFpbkl0ZXJhdG9yOjpnZXQpOgorICAgICAg ICAoSlNDOjpTY29wZUNoYWluSXRlcmF0b3I6Om9wZXJhdG9yLT4pOgorICAgICAgICAoSlNDOjpT Y29wZUNoYWluSXRlcmF0b3I6Om9wZXJhdG9yKyspOgorICAgICAgICAoSlNDOjpTY29wZUNoYWlu SXRlcmF0b3I6Om9wZXJhdG9yPT0pOgorICAgICAgICAoSlNDOjpTY29wZUNoYWluSXRlcmF0b3I6 Om9wZXJhdG9yIT0pOgorICAgICAgICAoSlNDOjpTY29wZUNoYWluTm9kZTo6YmVnaW4pOgorICAg ICAgICAoSlNDOjpTY29wZUNoYWluTm9kZTo6ZW5kKTogSSBtb3ZlZCBTY29wZUNoYWluSXRlcmF0 b3IgdG8gdGhpcyBmaWxlCisgICAgICAgIHRvIHJlc29sdmUgYSBjaXJjdWxhciAjaW5jbHVkZSBw cm9ibGVtLiBFdmVudHVhbGx5LCBJJ2xsIHByb2JhYmx5IHJlbmFtZQorICAgICAgICBpdCB0byBK U1Njb3BlOjppdGVyYXRvciwgc28gSSB0aGluayBpdCBiZWxvbmdzIGhlcmUuCisKKyAgICAgICAg KiBydW50aW1lL1Njb3BlQ2hhaW4uY3BwOgorICAgICAgICAoSlNDOjpTY29wZUNoYWluTm9kZTo6 cHJpbnQpOgorICAgICAgICAoSlNDOjpTY29wZUNoYWluTm9kZTo6bG9jYWxEZXB0aCk6IC4gdnMg LT4KKworICAgICAgICAqIHJ1bnRpbWUvU2NvcGVDaGFpbi5oOgorICAgICAgICAoU2NvcGVDaGFp bk5vZGUpOiBJIG1hZGUgdGhlICdvYmplY3QnIGRhdGEgbWVtYmVyIHByaXZhdGUgYmVjYXVzZSBp dCdzCisgICAgICAgIG5vIGxvbmdlciBzYWZlIHRvIGFjY2VzcyAtLSB5b3UgbmVlZCB0byBjYWxs IEpTU2NvcGU6Om9iamVjdEF0U2NvcGUoKQorICAgICAgICBpbnN0ZWFkLgorCisgICAgICAgIFRo ZSBKSVRzIG5lZWQgdG8gYmUgZnJpZW5kcyBiZWNhdXNlIG9mIHRoZSBwcml2YXRlIGRlY2xhcmF0 aW9uLgorCisgICAgICAgIFN1YnRseSwgSklUL0xMSW50IGNvZGUgaXMgY29ycmVjdCB3aXRob3V0 IGFueSBjaGFuZ2VzIGJlY2F1c2UgSklUL0xMSW50CisgICAgICAgIGNvZGUgbmV2ZXIgY29tcGls ZXMgZGlyZWN0IGFjY2VzcyB0byBhIHdpdGggc2NvcGUuCisKIDIwMTItMDgtMjggIE1hcmsgTGFt ICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZGluZyBzdXBwb3J0IGZvciBhZGRp bmcgTExJbnQgb3Bjb2RlIGV4dGVuc2lvbnMuICBUaGlzIHdpbGwgYmUgbmVlZGVkCkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvRXZhbENvZGVDYWNoZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9FdmFsQ29kZUNhY2hlLmgJKHJldmlz aW9uIDEyNjk1NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9FdmFsQ29kZUNh Y2hlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDcgKzQ3LDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAg ICAgcHVibGljOgogICAgICAgICBFdmFsRXhlY3V0YWJsZSogdHJ5R2V0KGJvb2wgaW5TdHJpY3RD b250ZXh0LCBjb25zdCBVU3RyaW5nJiBldmFsU291cmNlLCBTY29wZUNoYWluTm9kZSogc2NvcGVD aGFpbikKICAgICAgICAgewotICAgICAgICAgICAgaWYgKCFpblN0cmljdENvbnRleHQgJiYgZXZh bFNvdXJjZS5sZW5ndGgoKSA8IG1heENhY2hlYWJsZVNvdXJjZUxlbmd0aCAmJiAoKnNjb3BlQ2hh aW4tPmJlZ2luKCkpLT5pc1ZhcmlhYmxlT2JqZWN0KCkpCisgICAgICAgICAgICBpZiAoIWluU3Ry aWN0Q29udGV4dCAmJiBldmFsU291cmNlLmxlbmd0aCgpIDwgbWF4Q2FjaGVhYmxlU291cmNlTGVu Z3RoICYmIHNjb3BlQ2hhaW4tPmJlZ2luKCktPmlzVmFyaWFibGVPYmplY3QoKSkKICAgICAgICAg ICAgICAgICByZXR1cm4gbV9jYWNoZU1hcC5nZXQoZXZhbFNvdXJjZS5pbXBsKCkpLmdldCgpOwog ICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgIH0KQEAgLTU5LDcgKzU5LDcgQEAgbmFtZXNw YWNlIEpTQyB7CiAgICAgICAgICAgICBpZiAoZXhjZXB0aW9uVmFsdWUpCiAgICAgICAgICAgICAg ICAgcmV0dXJuIDA7CiAgICAgICAgICAgICAKLSAgICAgICAgICAgIGlmICghaW5TdHJpY3RDb250 ZXh0ICYmIGV2YWxTb3VyY2UubGVuZ3RoKCkgPCBtYXhDYWNoZWFibGVTb3VyY2VMZW5ndGggJiYg KCpzY29wZUNoYWluLT5iZWdpbigpKS0+aXNWYXJpYWJsZU9iamVjdCgpICYmIG1fY2FjaGVNYXAu c2l6ZSgpIDwgbWF4Q2FjaGVFbnRyaWVzKQorICAgICAgICAgICAgaWYgKCFpblN0cmljdENvbnRl eHQgJiYgZXZhbFNvdXJjZS5sZW5ndGgoKSA8IG1heENhY2hlYWJsZVNvdXJjZUxlbmd0aCAmJiBz Y29wZUNoYWluLT5iZWdpbigpLT5pc1ZhcmlhYmxlT2JqZWN0KCkgJiYgbV9jYWNoZU1hcC5zaXpl KCkgPCBtYXhDYWNoZUVudHJpZXMpCiAgICAgICAgICAgICAgICAgbV9jYWNoZU1hcC5zZXQoZXZh bFNvdXJjZS5pbXBsKCksIFdyaXRlQmFycmllcjxFdmFsRXhlY3V0YWJsZT4oZXhlYy0+Z2xvYmFs RGF0YSgpLCBvd25lciwgZXZhbEV4ZWN1dGFibGUpKTsKICAgICAgICAgICAgIAogICAgICAgICAg ICAgcmV0dXJuIGV2YWxFeGVjdXRhYmxlOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5 dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHAJKHJldmlzaW9u IDEyNjk1NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVH ZW5lcmF0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjcyLDcgKzEyNzIsNyBAQCBSZXNvbHZl UmVzdWx0IEJ5dGVjb2RlR2VuZXJhdG9yOjpyZXNvbHZlCiAgICAgc2l6ZV90IGRlcHRoT2ZGaXJz dFNjb3BlV2l0aER5bmFtaWNDaGVja3MgPSAwOwogICAgIHVuc2lnbmVkIGZsYWdzID0gMDsKICAg ICBmb3IgKDsgaXRlciAhPSBlbmQ7ICsraXRlciwgKytkZXB0aCkgewotICAgICAgICBKU09iamVj dCogY3VycmVudFNjb3BlID0gaXRlci0+Z2V0KCk7CisgICAgICAgIEpTT2JqZWN0KiBjdXJyZW50 U2NvcGUgPSBpdGVyLmdldCgpOwogICAgICAgICBpZiAoIWN1cnJlbnRTY29wZS0+aXNWYXJpYWJs ZU9iamVjdCgpKSB7CiAgICAgICAgICAgICBmbGFncyB8PSBSZXNvbHZlUmVzdWx0OjpEeW5hbWlj RmxhZzsKICAgICAgICAgICAgIGJyZWFrOwpAQCAtMTMxMCw3ICsxMzEwLDcgQEAgUmVzb2x2ZVJl c3VsdCBCeXRlY29kZUdlbmVyYXRvcjo6cmVzb2x2ZQogICAgIH0KIAogICAgIC8vIENhbid0IGxv Y2F0ZSB0aGUgcHJvcGVydHkgYnV0IHdlJ3JlIGFibGUgdG8gYXZvaWQgYSBmZXcgbG9va3Vwcy4K LSAgICBKU09iamVjdCogc2NvcGUgPSBpdGVyLT5nZXQoKTsKKyAgICBKU09iamVjdCogc2NvcGUg PSBpdGVyLmdldCgpOwogICAgIC8vIFN0ZXAgb3ZlciB0aGUgZnVuY3Rpb24ncyBhY3RpdmF0aW9u LCBpZiBpdCBuZWVkcyBvbmUuIEF0IHRoaXMgcG9pbnQgd2UKICAgICAvLyBrbm93IHRoZXJlIGlz IG5vIGR5bmFtaWMgc2NvcGUgaW4gdGhlIGZ1bmN0aW9uIGl0c2VsZiwgc28gdGhpcyBpcyBzYWZl IHRvCiAgICAgLy8gZG8uCkBAIC0xMzQxLDcgKzEzNDEsNyBAQCBSZXNvbHZlUmVzdWx0IEJ5dGVj b2RlR2VuZXJhdG9yOjpyZXNvbHZlCiAgICAgU2NvcGVDaGFpbkl0ZXJhdG9yIGVuZCA9IHNjb3Bl Q2hhaW4oKS0+ZW5kKCk7CiAgICAgc2l6ZV90IGRlcHRoID0gMDsKICAgICBmb3IgKDsgaXRlciAh PSBlbmQ7ICsraXRlciwgKytkZXB0aCkgewotICAgICAgICBKU09iamVjdCogY3VycmVudFNjb3Bl ID0gaXRlci0+Z2V0KCk7CisgICAgICAgIEpTT2JqZWN0KiBjdXJyZW50U2NvcGUgPSBpdGVyLmdl dCgpOwogICAgICAgICBpZiAoIWN1cnJlbnRTY29wZS0+aXNWYXJpYWJsZU9iamVjdCgpKQogICAg ICAgICAgICAgY29udGludWU7CiAgICAgICAgIEpTU3ltYm9sVGFibGVPYmplY3QqIGN1cnJlbnRW YXJpYWJsZU9iamVjdCA9IGpzQ2FzdDxKU1N5bWJvbFRhYmxlT2JqZWN0Kj4oY3VycmVudFNjb3Bl KTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVy cHJldGVyLmNwcAkocmV2aXNpb24gMTI2OTU2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2lu dGVycHJldGVyL0ludGVycHJldGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDY1LDExICs0NjUs MTEgQEAgTkVWRVJfSU5MSU5FIGJvb2wgSW50ZXJwcmV0ZXI6OnVud2luZENhbAogICAgICAgICAg ICAgb2xkQ29kZUJsb2NrLT5jcmVhdGVBY3RpdmF0aW9uKGNhbGxGcmFtZSk7CiAgICAgICAgICAg ICBzY29wZUNoYWluID0gY2FsbEZyYW1lLT5zY29wZUNoYWluKCk7CiAgICAgICAgIH0KLSAgICAg ICAgd2hpbGUgKCFzY29wZUNoYWluLT5vYmplY3QtPmluaGVyaXRzKCZKU0FjdGl2YXRpb246OnNf aW5mbykpCisgICAgICAgIHdoaWxlICghSlNTY29wZTo6b2JqZWN0QXRTY29wZShzY29wZUNoYWlu KS0+aW5oZXJpdHMoJkpTQWN0aXZhdGlvbjo6c19pbmZvKSkKICAgICAgICAgICAgIHNjb3BlQ2hh aW4gPSBzY29wZUNoYWluLT5wb3AoKTsKIAogICAgICAgICBjYWxsRnJhbWUtPnNldFNjb3BlQ2hh aW4oc2NvcGVDaGFpbik7Ci0gICAgICAgIEpTQWN0aXZhdGlvbiogYWN0aXZhdGlvbiA9IGFzQWN0 aXZhdGlvbihzY29wZUNoYWluLT5vYmplY3QuZ2V0KCkpOworICAgICAgICBKU0FjdGl2YXRpb24q IGFjdGl2YXRpb24gPSBhc0FjdGl2YXRpb24oSlNTY29wZTo6b2JqZWN0QXRTY29wZShzY29wZUNo YWluKSk7CiAgICAgICAgIGFjdGl2YXRpb24tPnRlYXJPZmYoKnNjb3BlQ2hhaW4tPmdsb2JhbERh dGEpOwogICAgICAgICBpZiAoSlNWYWx1ZSBhcmd1bWVudHMgPSBjYWxsRnJhbWUtPnVuY2hlY2tl ZFIodW5tb2RpZmllZEFyZ3VtZW50c1JlZ2lzdGVyKG9sZENvZGVCbG9jay0+YXJndW1lbnRzUmVn aXN0ZXIoKSkpLmpzVmFsdWUoKSkKICAgICAgICAgICAgIGFzQXJndW1lbnRzKGFyZ3VtZW50cykt PmRpZFRlYXJPZmZBY3RpdmF0aW9uKGNhbGxGcmFtZS0+Z2xvYmFsRGF0YSgpLCBhY3RpdmF0aW9u KTsKQEAgLTEyODUsOCArMTI4NSw4IEBAIEpTVmFsdWUgSW50ZXJwcmV0ZXI6OmV4ZWN1dGUoRXZh bEV4ZWN1dGEKICAgICBKU09iamVjdCogdmFyaWFibGVPYmplY3Q7CiAgICAgZm9yIChTY29wZUNo YWluTm9kZSogbm9kZSA9IHNjb3BlQ2hhaW47IDsgbm9kZSA9IG5vZGUtPm5leHQuZ2V0KCkpIHsK ICAgICAgICAgQVNTRVJUKG5vZGUpOwotICAgICAgICBpZiAobm9kZS0+b2JqZWN0LT5pc1Zhcmlh YmxlT2JqZWN0KCkgJiYgIW5vZGUtPm9iamVjdC0+aXNOYW1lU2NvcGVPYmplY3QoKSkgewotICAg ICAgICAgICAgdmFyaWFibGVPYmplY3QgPSBqc0Nhc3Q8SlNTeW1ib2xUYWJsZU9iamVjdCo+KG5v ZGUtPm9iamVjdC5nZXQoKSk7CisgICAgICAgIGlmIChKU1Njb3BlOjpvYmplY3RBdFNjb3BlKG5v ZGUpLT5pc1ZhcmlhYmxlT2JqZWN0KCkgJiYgIUpTU2NvcGU6Om9iamVjdEF0U2NvcGUobm9kZSkt PmlzTmFtZVNjb3BlT2JqZWN0KCkpIHsKKyAgICAgICAgICAgIHZhcmlhYmxlT2JqZWN0ID0ganND YXN0PEpTU3ltYm9sVGFibGVPYmplY3QqPihKU1Njb3BlOjpvYmplY3RBdFNjb3BlKG5vZGUpKTsK ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgfQpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvSlNTY29wZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvSlNTY29wZS5jcHAJKHJldmlzaW9uIDEyNjk1NikKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTU2NvcGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01 Nyw3ICs1Nyw3IEBAIEpTVmFsdWUgSlNTY29wZTo6cmVzb2x2ZShDYWxsRnJhbWUqIGNhbGwKICAg ICBBU1NFUlQoc2NvcGVDaGFpbik7CiAKICAgICBkbyB7Ci0gICAgICAgIEpTT2JqZWN0KiBzY29w ZSA9IHNjb3BlQ2hhaW4tPm9iamVjdC5nZXQoKTsKKyAgICAgICAgSlNPYmplY3QqIHNjb3BlID0g SlNTY29wZTo6b2JqZWN0QXRTY29wZShzY29wZUNoYWluKTsKICAgICAgICAgUHJvcGVydHlTbG90 IHNsb3Qoc2NvcGUpOwogICAgICAgICBpZiAoc2NvcGUtPmdldFByb3BlcnR5U2xvdChjYWxsRnJh bWUsIGlkZW50aWZpZXIsIHNsb3QpKQogICAgICAgICAgICAgcmV0dXJuIHNsb3QuZ2V0VmFsdWUo Y2FsbEZyYW1lLCBpZGVudGlmaWVyKTsKQEAgLTg1LDcgKzg1LDcgQEAgSlNWYWx1ZSBKU1Njb3Bl OjpyZXNvbHZlU2tpcChDYWxsRnJhbWUqIAogICAgIH0KIAogICAgIGRvIHsKLSAgICAgICAgSlNP YmplY3QqIHNjb3BlID0gc2NvcGVDaGFpbi0+b2JqZWN0LmdldCgpOworICAgICAgICBKU09iamVj dCogc2NvcGUgPSBKU1Njb3BlOjpvYmplY3RBdFNjb3BlKHNjb3BlQ2hhaW4pOwogICAgICAgICBQ cm9wZXJ0eVNsb3Qgc2xvdChzY29wZSk7CiAgICAgICAgIGlmIChzY29wZS0+Z2V0UHJvcGVydHlT bG90KGNhbGxGcmFtZSwgaWRlbnRpZmllciwgc2xvdCkpCiAgICAgICAgICAgICByZXR1cm4gc2xv dC5nZXRWYWx1ZShjYWxsRnJhbWUsIGlkZW50aWZpZXIpOwpAQCAtMTQwLDcgKzE0MCw3IEBAIEpT VmFsdWUgSlNTY29wZTo6cmVzb2x2ZUdsb2JhbER5bmFtaWMoCiAgICAgICAgICAgICBzY29wZUNo YWluID0gc2NvcGVDaGFpbi0+bmV4dC5nZXQoKTsKICAgICB9CiAgICAgd2hpbGUgKHNraXAtLSkg ewotICAgICAgICBKU09iamVjdCogc2NvcGUgPSBzY29wZUNoYWluLT5vYmplY3QuZ2V0KCk7Cisg ICAgICAgIEpTT2JqZWN0KiBzY29wZSA9IEpTU2NvcGU6Om9iamVjdEF0U2NvcGUoc2NvcGVDaGFp bik7CiAgICAgICAgIGlmICghc2NvcGUtPmhhc0N1c3RvbVByb3BlcnRpZXMoKSkKICAgICAgICAg ICAgIGNvbnRpbnVlOwogCkBAIC0xNjMsNyArMTYzLDcgQEAgSlNWYWx1ZSBKU1Njb3BlOjpyZXNv bHZlQmFzZShDYWxsRnJhbWUqIAogICAgIEFTU0VSVChzY29wZUNoYWluKTsKIAogICAgIGRvIHsK LSAgICAgICAgSlNPYmplY3QqIHNjb3BlID0gc2NvcGVDaGFpbi0+b2JqZWN0LmdldCgpOworICAg ICAgICBKU09iamVjdCogc2NvcGUgPSBKU1Njb3BlOjpvYmplY3RBdFNjb3BlKHNjb3BlQ2hhaW4p OwogCiAgICAgICAgIFByb3BlcnR5U2xvdCBzbG90KHNjb3BlKTsKICAgICAgICAgaWYgKCFzY29w ZS0+Z2V0UHJvcGVydHlTbG90KGNhbGxGcmFtZSwgaWRlbnRpZmllciwgc2xvdCkpCkBAIC0xODQs NyArMTg0LDcgQEAgSlNWYWx1ZSBKU1Njb3BlOjpyZXNvbHZlV2l0aEJhc2UoQ2FsbEZyYQogICAg IEFTU0VSVChzY29wZUNoYWluKTsKIAogICAgIGRvIHsKLSAgICAgICAgSlNPYmplY3QqIHNjb3Bl ID0gc2NvcGVDaGFpbi0+b2JqZWN0LmdldCgpOworICAgICAgICBKU09iamVjdCogc2NvcGUgPSBK U1Njb3BlOjpvYmplY3RBdFNjb3BlKHNjb3BlQ2hhaW4pOwogCiAgICAgICAgIFByb3BlcnR5U2xv dCBzbG90KHNjb3BlKTsKICAgICAgICAgaWYgKCFzY29wZS0+Z2V0UHJvcGVydHlTbG90KGNhbGxG cmFtZSwgaWRlbnRpZmllciwgc2xvdCkpCkBAIC0yMDcsNyArMjA3LDcgQEAgSlNWYWx1ZSBKU1Nj b3BlOjpyZXNvbHZlV2l0aFRoaXMoQ2FsbEZyYQogICAgIEFTU0VSVChzY29wZUNoYWluKTsKIAog ICAgIGRvIHsKLSAgICAgICAgSlNPYmplY3QqIHNjb3BlID0gc2NvcGVDaGFpbi0+b2JqZWN0Lmdl dCgpOworICAgICAgICBKU09iamVjdCogc2NvcGUgPSBKU1Njb3BlOjpvYmplY3RBdFNjb3BlKHNj b3BlQ2hhaW4pOwogCiAgICAgICAgIFByb3BlcnR5U2xvdCBzbG90KHNjb3BlKTsKICAgICAgICAg aWYgKCFzY29wZS0+Z2V0UHJvcGVydHlTbG90KGNhbGxGcmFtZSwgaWRlbnRpZmllciwgc2xvdCkp CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU1Njb3BlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNTY29wZS5oCShyZXZpc2lvbiAx MjY5NTYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU1Njb3BlLmgJKHdvcmtp bmcgY29weSkKQEAgLTM0LDYgKzM0LDggQEAgY2xhc3MgSlNTY29wZSA6IHB1YmxpYyBKU05vbkZp bmFsT2JqZWN0IAogcHVibGljOgogICAgIHR5cGVkZWYgSlNOb25GaW5hbE9iamVjdCBCYXNlOwog CisgICAgc3RhdGljIEpTT2JqZWN0KiBvYmplY3RBdFNjb3BlKFNjb3BlQ2hhaW5Ob2RlKik7CisK ICAgICBzdGF0aWMgSlNWYWx1ZSByZXNvbHZlKENhbGxGcmFtZSosIGNvbnN0IElkZW50aWZpZXIm KTsKICAgICBzdGF0aWMgSlNWYWx1ZSByZXNvbHZlU2tpcChDYWxsRnJhbWUqLCBjb25zdCBJZGVu dGlmaWVyJiwgaW50IHNraXApOwogICAgIHN0YXRpYyBKU1ZhbHVlIHJlc29sdmVHbG9iYWwoCkBA IC02NSw2ICs2Nyw0MiBAQCBpbmxpbmUgSlNTY29wZTo6SlNTY29wZShKU0dsb2JhbERhdGEmIGds CiB7CiB9CiAKK2lubGluZSBKU09iamVjdCogSlNTY29wZTo6b2JqZWN0QXRTY29wZShTY29wZUNo YWluTm9kZSogc2NvcGVDaGFpbikKK3sKKyAgICByZXR1cm4gc2NvcGVDaGFpbi0+b2JqZWN0Lmdl dCgpOworfQorCitjbGFzcyBTY29wZUNoYWluSXRlcmF0b3IgeworcHVibGljOgorICAgIFNjb3Bl Q2hhaW5JdGVyYXRvcihTY29wZUNoYWluTm9kZSogbm9kZSkKKyAgICAgICAgOiBtX25vZGUobm9k ZSkKKyAgICB7CisgICAgfQorCisgICAgSlNPYmplY3QqIGdldCgpIGNvbnN0IHsgcmV0dXJuIEpT U2NvcGU6Om9iamVjdEF0U2NvcGUobV9ub2RlKTsgfQorICAgIEpTT2JqZWN0KiBvcGVyYXRvci0+ KCkgY29uc3QgeyByZXR1cm4gSlNTY29wZTo6b2JqZWN0QXRTY29wZShtX25vZGUpOyB9CisKKyAg ICBTY29wZUNoYWluSXRlcmF0b3ImIG9wZXJhdG9yKysoKSB7IG1fbm9kZSA9IG1fbm9kZS0+bmV4 dC5nZXQoKTsgcmV0dXJuICp0aGlzOyB9CisKKyAgICAvLyBwb3N0Zml4ICsrIGludGVudGlvbmFs bHkgb21pdHRlZAorCisgICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IFNjb3BlQ2hhaW5JdGVyYXRv ciYgb3RoZXIpIGNvbnN0IHsgcmV0dXJuIG1fbm9kZSA9PSBvdGhlci5tX25vZGU7IH0KKyAgICBi b29sIG9wZXJhdG9yIT0oY29uc3QgU2NvcGVDaGFpbkl0ZXJhdG9yJiBvdGhlcikgY29uc3QgeyBy ZXR1cm4gbV9ub2RlICE9IG90aGVyLm1fbm9kZTsgfQorCitwcml2YXRlOgorICAgIFNjb3BlQ2hh aW5Ob2RlKiBtX25vZGU7Cit9OworCitpbmxpbmUgU2NvcGVDaGFpbkl0ZXJhdG9yIFNjb3BlQ2hh aW5Ob2RlOjpiZWdpbigpCit7CisgICAgcmV0dXJuIFNjb3BlQ2hhaW5JdGVyYXRvcih0aGlzKTsg Cit9CisKK2lubGluZSBTY29wZUNoYWluSXRlcmF0b3IgU2NvcGVDaGFpbk5vZGU6OmVuZCgpCit7 IAorICAgIHJldHVybiBTY29wZUNoYWluSXRlcmF0b3IoMCk7IAorfQorCiB9IC8vIG5hbWVzcGFj ZSBKU0MKIAogI2VuZGlmIC8vIEpTU2NvcGVfaApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvU2NvcGVDaGFpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvU2NvcGVDaGFpbi5jcHAJKHJldmlzaW9uIDEyNjk1NikKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL1Njb3BlQ2hhaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z Nyw3ICszNyw3IEBAIHZvaWQgU2NvcGVDaGFpbk5vZGU6OnByaW50KCkKIHsKICAgICBTY29wZUNo YWluSXRlcmF0b3Igc2NvcGVFbmQgPSBlbmQoKTsKICAgICBmb3IgKFNjb3BlQ2hhaW5JdGVyYXRv ciBzY29wZUl0ZXIgPSBiZWdpbigpOyBzY29wZUl0ZXIgIT0gc2NvcGVFbmQ7ICsrc2NvcGVJdGVy KSB7Ci0gICAgICAgIEpTT2JqZWN0KiBvID0gc2NvcGVJdGVyLT5nZXQoKTsKKyAgICAgICAgSlNP YmplY3QqIG8gPSBzY29wZUl0ZXIuZ2V0KCk7CiAgICAgICAgIFByb3BlcnR5TmFtZUFycmF5IHBy b3BlcnR5TmFtZXMoZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCkpOwogICAgICAgICBvLT5tZXRo b2RUYWJsZSgpLT5nZXRQcm9wZXJ0eU5hbWVzKG8sIGdsb2JhbE9iamVjdC0+Z2xvYmFsRXhlYygp LCBwcm9wZXJ0eU5hbWVzLCBFeGNsdWRlRG9udEVudW1Qcm9wZXJ0aWVzKTsKICAgICAgICAgUHJv cGVydHlOYW1lQXJyYXk6OmNvbnN0X2l0ZXJhdG9yIHByb3BFbmQgPSBwcm9wZXJ0eU5hbWVzLmVu ZCgpOwpAQCAtNjAsNyArNjAsNyBAQCBpbnQgU2NvcGVDaGFpbk5vZGU6OmxvY2FsRGVwdGgoKQog ICAgIGludCBzY29wZURlcHRoID0gMDsKICAgICBTY29wZUNoYWluSXRlcmF0b3IgaXRlciA9IHRo aXMtPmJlZ2luKCk7CiAgICAgU2NvcGVDaGFpbkl0ZXJhdG9yIGVuZCA9IHRoaXMtPmVuZCgpOwot ICAgIHdoaWxlICghKCppdGVyKS0+aW5oZXJpdHMoJkpTQWN0aXZhdGlvbjo6c19pbmZvKSkgewor ICAgIHdoaWxlICghaXRlci0+aW5oZXJpdHMoJkpTQWN0aXZhdGlvbjo6c19pbmZvKSkgewogICAg ICAgICArK2l0ZXI7CiAgICAgICAgIGlmIChpdGVyID09IGVuZCkKICAgICAgICAgICAgIGJyZWFr OwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU2NvcGVDaGFpbi5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Njb3BlQ2hhaW4uaAkocmV2 aXNpb24gMTI2OTU2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU2NvcGVDaGFp bi5oCSh3b3JraW5nIGNvcHkpCkBAIC03MSw3ICs3MSw5IEBAIG5hbWVzcGFjZSBKU0MgewogICAg ICAgICAKICAgICAgICAgSlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRhOwogICAgICAgICBXcml0ZUJh cnJpZXI8U2NvcGVDaGFpbk5vZGU+IG5leHQ7CisgICAgcHJpdmF0ZToKICAgICAgICAgV3JpdGVC YXJyaWVyPEpTT2JqZWN0PiBvYmplY3Q7CisgICAgcHVibGljOgogICAgICAgICBXcml0ZUJhcnJp ZXI8SlNHbG9iYWxPYmplY3Q+IGdsb2JhbE9iamVjdDsKICAgICAgICAgV3JpdGVCYXJyaWVyPEpT T2JqZWN0PiBnbG9iYWxUaGlzOwogCkBAIC05Myw2ICs5NSwxMCBAQCBuYW1lc3BhY2UgSlNDIHsK IAogICAgIHByaXZhdGU6CiAgICAgICAgIGZyaWVuZCBjbGFzcyBMTEludE9mZnNldHNFeHRyYWN0 b3I7CisgICAgICAgIGZyaWVuZCBjbGFzcyBTY29wZUNoYWluSXRlcmF0b3I7CisgICAgICAgIGZy aWVuZCBjbGFzcyBKU1Njb3BlOworICAgICAgICBmcmllbmQgY2xhc3MgREZHOjpTcGVjdWxhdGl2 ZUpJVDsKKyAgICAgICAgZnJpZW5kIGNsYXNzIEpJVDsKICAgICAgICAgCiAgICAgICAgIHN0YXRp YyBjb25zdCB1bnNpZ25lZCBTdHJ1Y3R1cmVGbGFncyA9IE92ZXJyaWRlc1Zpc2l0Q2hpbGRyZW47 CiAgICAgfTsKQEAgLTEwOSwzNyArMTE1LDYgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHJl dHVybiBuZXh0LmdldCgpOwogICAgIH0KIAotICAgIGNsYXNzIFNjb3BlQ2hhaW5JdGVyYXRvciB7 Ci0gICAgcHVibGljOgotICAgICAgICBTY29wZUNoYWluSXRlcmF0b3IoU2NvcGVDaGFpbk5vZGUq IG5vZGUpCi0gICAgICAgICAgICA6IG1fbm9kZShub2RlKQotICAgICAgICB7Ci0gICAgICAgIH0K LQotICAgICAgICBXcml0ZUJhcnJpZXI8SlNPYmplY3Q+IGNvbnN0ICYgb3BlcmF0b3IqKCkgY29u c3QgeyByZXR1cm4gbV9ub2RlLT5vYmplY3Q7IH0KLSAgICAgICAgV3JpdGVCYXJyaWVyPEpTT2Jq ZWN0PiBjb25zdCAqIG9wZXJhdG9yLT4oKSBjb25zdCB7IHJldHVybiAmKG9wZXJhdG9yKigpKTsg fQotICAgIAotICAgICAgICBTY29wZUNoYWluSXRlcmF0b3ImIG9wZXJhdG9yKysoKSB7IG1fbm9k ZSA9IG1fbm9kZS0+bmV4dC5nZXQoKTsgcmV0dXJuICp0aGlzOyB9Ci0KLSAgICAgICAgLy8gcG9z dGZpeCArKyBpbnRlbnRpb25hbGx5IG9taXR0ZWQKLQotICAgICAgICBib29sIG9wZXJhdG9yPT0o Y29uc3QgU2NvcGVDaGFpbkl0ZXJhdG9yJiBvdGhlcikgY29uc3QgeyByZXR1cm4gbV9ub2RlID09 IG90aGVyLm1fbm9kZTsgfQotICAgICAgICBib29sIG9wZXJhdG9yIT0oY29uc3QgU2NvcGVDaGFp bkl0ZXJhdG9yJiBvdGhlcikgY29uc3QgeyByZXR1cm4gbV9ub2RlICE9IG90aGVyLm1fbm9kZTsg fQotCi0gICAgcHJpdmF0ZToKLSAgICAgICAgU2NvcGVDaGFpbk5vZGUqIG1fbm9kZTsKLSAgICB9 OwotCi0gICAgaW5saW5lIFNjb3BlQ2hhaW5JdGVyYXRvciBTY29wZUNoYWluTm9kZTo6YmVnaW4o KQotICAgIHsKLSAgICAgICAgcmV0dXJuIFNjb3BlQ2hhaW5JdGVyYXRvcih0aGlzKTsgCi0gICAg fQotCi0gICAgaW5saW5lIFNjb3BlQ2hhaW5JdGVyYXRvciBTY29wZUNoYWluTm9kZTo6ZW5kKCkK LSAgICB7IAotICAgICAgICByZXR1cm4gU2NvcGVDaGFpbkl0ZXJhdG9yKDApOyAKLSAgICB9Ci0K ICAgICBBTFdBWVNfSU5MSU5FIEpTR2xvYmFsRGF0YSYgRXhlY1N0YXRlOjpnbG9iYWxEYXRhKCkg Y29uc3QKICAgICB7CiAgICAgICAgIEFTU0VSVChzY29wZUNoYWluKCktPmdsb2JhbERhdGEpOwpJ bmRleDogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTI2OTU2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDgtMjggIEdlb2ZmcmV5 IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGRlZCBKU1Njb3BlOjpvYmpl Y3RJblNjb3BlKCksIGFuZCByZWZhY3RvcmVkIGNhbGxlcnMgdG8gdXNlIGl0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTI4MQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYmluZGluZ3MvanMvSlNKYXZh U2NyaXB0Q2FsbEZyYW1lQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpTSmF2YVNjcmlw dENhbGxGcmFtZTo6c2NvcGVDaGFpbik6CisgICAgICAgIChXZWJDb3JlOjpKU0phdmFTY3JpcHRD YWxsRnJhbWU6OnNjb3BlVHlwZSk6CisKIDIwMTItMDgtMjggIERhdmlkIFJldmVtYW4gIDxyZXZl bWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIFNjaGVkdWxlciB3aWxsIG5l dmVyIHByb2Nlc3MgYSBjb21taXQgdW50aWwgaXQgcmVjZWl2ZXMgYSB2c3luYyB0aWNrLgpJbmRl eDogU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNKYXZhU2NyaXB0Q2FsbEZyYW1lQ3VzdG9t LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0phdmFTY3Jp cHRDYWxsRnJhbWVDdXN0b20uY3BwCShyZXZpc2lvbiAxMjY5NTYpCisrKyBTb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9qcy9KU0phdmFTY3JpcHRDYWxsRnJhbWVDdXN0b20uY3BwCSh3b3JraW5nIGNv cHkpCkBAIC04Niw3ICs4Niw3IEBAIEpTVmFsdWUgSlNKYXZhU2NyaXB0Q2FsbEZyYW1lOjpzY29w ZUNoYWkKIAogICAgIE1hcmtlZEFyZ3VtZW50QnVmZmVyIGxpc3Q7CiAgICAgZG8gewotICAgICAg ICBsaXN0LmFwcGVuZChpdGVyLT5nZXQoKSk7CisgICAgICAgIGxpc3QuYXBwZW5kKGl0ZXIuZ2V0 KCkpOwogICAgICAgICArK2l0ZXI7CiAgICAgfSB3aGlsZSAoaXRlciAhPSBlbmQpOwogCkBAIC0x MDcsNyArMTA3LDcgQEAgSlNWYWx1ZSBKU0phdmFTY3JpcHRDYWxsRnJhbWU6OnNjb3BlVHlwZQog CiAgICAgYm9vbCBmb3VuZExvY2FsU2NvcGUgPSBmYWxzZTsKICAgICBmb3IgKFNjb3BlQ2hhaW5J dGVyYXRvciBpdGVyID0gc2NvcGVDaGFpbi0+YmVnaW4oKTsgaXRlciAhPSBlbmQ7ICsraXRlcikg ewotICAgICAgICBKU09iamVjdCogc2NvcGUgPSBpdGVyLT5nZXQoKTsKKyAgICAgICAgSlNPYmpl Y3QqIHNjb3BlID0gaXRlci5nZXQoKTsKICAgICAgICAgaWYgKHNjb3BlLT5pc0FjdGl2YXRpb25P YmplY3QoKSkgewogICAgICAgICAgICAgaWYgKCFmb3VuZExvY2FsU2NvcGUpIHsKICAgICAgICAg ICAgICAgICAvLyBGaXJzdCBhY3RpdmF0aW9uIG9iamVjdCBpcyBsb2NhbCBzY29wZSwgZWFjaCBz dWNjZXNzaXZlIGFjdGl2YXRpb24gb2JqZWN0IGlzIGNsb3N1cmUuCkluZGV4OiBTb3VyY2UvV2Vi S2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvQ2hhbmdl TG9nCShyZXZpc2lvbiAxMjY5NTYpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wOC0yOCAgR2VvZmZyZXkgR2FyZW4g IDxnZ2FyZW5AYXBwbGUuY29tPgorCisgICAgICAgIEFkZGVkIEpTU2NvcGU6Om9iamVjdEluU2Nv cGUoKSwgYW5kIHJlZmFjdG9yZWQgY2FsbGVycyB0byB1c2UgaXQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1MjgxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYlNjcmlwdERlYnVnRGVs ZWdhdGUubW06CisgICAgICAgICgtW1dlYlNjcmlwdENhbGxGcmFtZSBzY29wZUNoYWluXSk6CisK IDIwMTItMDgtMjggIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMjY5MTQuCkluZGV4OiBTb3VyY2Uv V2ViS2l0L21hYy9XZWJWaWV3L1dlYlNjcmlwdERlYnVnRGVsZWdhdGUubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJTY3JpcHREZWJ1Z0RlbGVnYXRlLm1tCShy ZXZpc2lvbiAxMjY5NTYpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlNjcmlwdERl YnVnRGVsZWdhdGUubW0JKHdvcmtpbmcgY29weSkKQEAgLTE4NCw3ICsxODQsNyBAQCAtIChOU0Fy cmF5ICopc2NvcGVDaGFpbgogCiAgICAgU2NvcGVDaGFpbkl0ZXJhdG9yIGVuZCA9IHNjb3BlQ2hh aW4tPmVuZCgpOwogICAgIGZvciAoU2NvcGVDaGFpbkl0ZXJhdG9yIGl0ID0gc2NvcGVDaGFpbi0+ YmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIEpTT2JqZWN0KiBvYmplY3QgPSBp dC0+Z2V0KCk7CisgICAgICAgIEpTT2JqZWN0KiBvYmplY3QgPSBpdC5nZXQoKTsKICAgICAgICAg aWYgKG9iamVjdC0+aXNBY3RpdmF0aW9uT2JqZWN0KCkpCiAgICAgICAgICAgICBvYmplY3QgPSBE ZWJ1Z2dlckFjdGl2YXRpb246OmNyZWF0ZSgqc2NvcGVDaGFpbi0+Z2xvYmFsRGF0YSwgb2JqZWN0 KTsKICAgICAgICAgW3Njb3BlcyBhZGRPYmplY3Q6W3NlbGYgX2NvbnZlcnRWYWx1ZVRvT2JqY1Zh bHVlOm9iamVjdF1dOwo=