130773 2014-03-26 05:36:55 -0700 Rename hasFastArrayStorage to be more appropriate 2014-03-26 08:08:41 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dbatyai.u-szeged webkit-unassigned commit-queue fpizlo oldest_to_newest 994556 0 dbatyai.u-szeged 2014-03-26 05:36:55 -0700 In JavaScriptCore/runtime/IndexingType.h: FIXME: This is an awkward name. This should really be called hasArrayStorage() and then next method down should be called hasAnyArrayStorage(). 994557 1 227845 dbatyai.u-szeged 2014-03-26 05:41:22 -0700 Created attachment 227845 Proposed patch 994574 2 227845 commit-queue 2014-03-26 08:08:39 -0700 Comment on attachment 227845 Proposed patch Clearing flags on attachment: 227845 Committed r166292: <http://trac.webkit.org/changeset/166292> 994575 3 commit-queue 2014-03-26 08:08:41 -0700 All reviewed patches have been landed. Closing bug. 227845 2014-03-26 05:41:22 -0700 2014-03-26 08:08:38 -0700 Proposed patch proposedpatch.patch text/plain 18094 dbatyai.u-szeged ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDJlNmFkZDkuLjMyNzE5NDEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDE0LTAzLTI2ICBEw6FuaWVsIELDoXR5 YWkgIDxkYmF0eWFpLnUtc3plZ2VkQHBhcnRuZXIuc2Ftc3VuZy5jb20+CisKKyAgICAgICAgUmVu YW1lIGhhc0Zhc3RBcnJheVN0b3JhZ2UgdG8gYmUgbW9yZSBhcHByb3ByaWF0ZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwNzczCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkZmcvREZHQXJyYXlNb2Rl LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpBcnJheU1vZGU6OmFscmVhZHlDaGVja2VkKToKKyAg ICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHA6CisgICAgICAgIChKU0M6OkRG Rzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUpOgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2 ZUpJVDY0LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZSk6 CisgICAgICAgICogZGZnL0RGR1dhdGNocG9pbnRDb2xsZWN0aW9uUGhhc2UuY3BwOgorICAgICAg ICAoSlNDOjpERkc6OldhdGNocG9pbnRDb2xsZWN0aW9uUGhhc2U6OmhhbmRsZSk6CisgICAgICAg ICogZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcDoKKyAgICAgICAgKEpTQzo6RlRMOjpMb3dlckRG R1RvTExWTTo6Y29tcGlsZU5ld0FycmF5KToKKyAgICAgICAgKEpTQzo6RlRMOjpMb3dlckRGR1Rv TExWTTo6Y29tcGlsZU5ld0FycmF5QnVmZmVyKToKKyAgICAgICAgKEpTQzo6RlRMOjpMb3dlckRG R1RvTExWTTo6Y29tcGlsZU5ld0FycmF5V2l0aFNpemUpOgorICAgICAgICAqIHJ1bnRpbWUvQnV0 dGVyZmx5SW5saW5lcy5oOgorICAgICAgICAoSlNDOjpCdXR0ZXJmbHk6OnVuc2hpZnQpOgorICAg ICAgICAoSlNDOjpCdXR0ZXJmbHk6OnNoaWZ0KToKKyAgICAgICAgKiBydW50aW1lL0luZGV4aW5n SGVhZGVySW5saW5lcy5oOgorICAgICAgICAoSlNDOjpJbmRleGluZ0hlYWRlcjo6cHJlQ2FwYWNp dHkpOgorICAgICAgICAqIHJ1bnRpbWUvSW5kZXhpbmdUeXBlLmg6CisgICAgICAgIChKU0M6Omhh c0FycmF5U3RvcmFnZSk6CisgICAgICAgIChKU0M6Omhhc0FueUFycmF5U3RvcmFnZSk6CisgICAg ICAgIChKU0M6Omhhc0Zhc3RBcnJheVN0b3JhZ2UpOiBEZWxldGVkLgorICAgICAgICAqIHJ1bnRp bWUvSlNBcnJheS5jcHA6CisgICAgICAgIChKU0M6OkpTQXJyYXk6OnNvcnRWZWN0b3IpOgorICAg ICAgICAoSlNDOjpKU0FycmF5Ojpjb21wYWN0Rm9yU29ydGluZyk6CisgICAgICAgICogcnVudGlt ZS9KU0FycmF5Lmg6CisgICAgICAgIChKU0M6OkpTQXJyYXk6OmNyZWF0ZSk6CisgICAgICAgIChK U0M6OkpTQXJyYXk6OnRyeUNyZWF0ZVVuaW5pdGlhbGl6ZWQpOgorICAgICAgICAqIHJ1bnRpbWUv SlNHbG9iYWxPYmplY3QuY3BwOgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3QuY3BwOgorICAg ICAgICAoSlNDOjpKU09iamVjdDo6cHV0RGlyZWN0SW5kZXhCZXlvbmRWZWN0b3JMZW5ndGhXaXRo QXJyYXlTdG9yYWdlKToKKyAgICAgICAgKiBydW50aW1lL0pTT2JqZWN0Lmg6CisgICAgICAgIChK U0M6OkpTT2JqZWN0OjplbnN1cmVBcnJheVN0b3JhZ2UpOgorICAgICAgICAoSlNDOjpKU09iamVj dDo6YXJyYXlTdG9yYWdlKToKKyAgICAgICAgKiBydW50aW1lL1N0cnVjdHVyZVRyYW5zaXRpb25U YWJsZS5oOgorICAgICAgICAoSlNDOjpuZXdJbmRleGluZ1R5cGUpOgorCiAyMDE0LTAzLTI2ICBa YW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk LiBSZW1vdmluZyB0aGUgcmVtYWluaW5nIEF1dG9tYWtlIGNydWZ0LgpkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBcnJheU1vZGUuY3BwIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdBcnJheU1vZGUuY3BwCmluZGV4IDlhOTM5ODAuLjBjYmRjN2MgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQXJyYXlNb2RlLmNwcAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0FycmF5TW9kZS5jcHAKQEAgLTM0NCwxNCArMzQ0 LDE0IEBAIGJvb2wgQXJyYXlNb2RlOjphbHJlYWR5Q2hlY2tlZChHcmFwaCYgZ3JhcGgsIE5vZGUq IG5vZGUsIEFic3RyYWN0VmFsdWUmIHZhbHVlKSBjCiAgICAgICAgICAgICBpZiAoYXJyYXlNb2Rl c0FscmVhZHlDaGVja2VkKHZhbHVlLm1fYXJyYXlNb2RlcywgYXNBcnJheU1vZGVzKEFycmF5V2l0 aEFycmF5U3RvcmFnZSkgfCBhc0FycmF5TW9kZXMoQXJyYXlXaXRoU2xvd1B1dEFycmF5U3RvcmFn ZSkpKQogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICAgICAgcmV0dXJuIHZh bHVlLm1fY3VycmVudEtub3duU3RydWN0dXJlLmhhc1NpbmdsZXRvbigpCi0gICAgICAgICAgICAg ICAgJiYgaGFzQXJyYXlTdG9yYWdlKHZhbHVlLm1fY3VycmVudEtub3duU3RydWN0dXJlLnNpbmds ZXRvbigpLT5pbmRleGluZ1R5cGUoKSkKKyAgICAgICAgICAgICAgICAmJiBoYXNBbnlBcnJheVN0 b3JhZ2UodmFsdWUubV9jdXJyZW50S25vd25TdHJ1Y3R1cmUuc2luZ2xldG9uKCktPmluZGV4aW5n VHlwZSgpKQogICAgICAgICAgICAgICAgICYmICh2YWx1ZS5tX2N1cnJlbnRLbm93blN0cnVjdHVy ZS5zaW5nbGV0b24oKS0+aW5kZXhpbmdUeXBlKCkgJiBJc0FycmF5KTsKICAgICAgICAgCiAgICAg ICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICBpZiAoYXJyYXlNb2Rlc0FscmVhZHlDaGVja2VkKHZh bHVlLm1fYXJyYXlNb2RlcywgYXNBcnJheU1vZGVzKE5vbkFycmF5V2l0aEFycmF5U3RvcmFnZSkg fCBhc0FycmF5TW9kZXMoQXJyYXlXaXRoQXJyYXlTdG9yYWdlKSB8IGFzQXJyYXlNb2RlcyhOb25B cnJheVdpdGhTbG93UHV0QXJyYXlTdG9yYWdlKSB8IGFzQXJyYXlNb2RlcyhBcnJheVdpdGhTbG93 UHV0QXJyYXlTdG9yYWdlKSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAg ICAgICByZXR1cm4gdmFsdWUubV9jdXJyZW50S25vd25TdHJ1Y3R1cmUuaGFzU2luZ2xldG9uKCkK LSAgICAgICAgICAgICAgICAmJiBoYXNBcnJheVN0b3JhZ2UodmFsdWUubV9jdXJyZW50S25vd25T dHJ1Y3R1cmUuc2luZ2xldG9uKCktPmluZGV4aW5nVHlwZSgpKTsKKyAgICAgICAgICAgICAgICAm JiBoYXNBbnlBcnJheVN0b3JhZ2UodmFsdWUubV9jdXJyZW50S25vd25TdHJ1Y3R1cmUuc2luZ2xl dG9uKCktPmluZGV4aW5nVHlwZSgpKTsKICAgICAgICAgfQogICAgICAgICAKICAgICBjYXNlIEFy cmF5OjpBcmd1bWVudHM6CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdT cGVjdWxhdGl2ZUpJVDMyXzY0LmNwcAppbmRleCBkNzMzYmQwLi4zOWY4M2ZkIDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHAK QEAgLTMxNjMsNyArMzE2Myw3IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUoTm9kZSog bm9kZSkKICAgICAgICAgCiAgICAgY2FzZSBOZXdBcnJheTogewogICAgICAgICBKU0dsb2JhbE9i amVjdCogZ2xvYmFsT2JqZWN0ID0gbV9qaXQuZ3JhcGgoKS5nbG9iYWxPYmplY3RGb3Iobm9kZS0+ b3JpZ2luLnNlbWFudGljKTsKLSAgICAgICAgaWYgKCFnbG9iYWxPYmplY3QtPmlzSGF2aW5nQUJh ZFRpbWUoKSAmJiAhaGFzQXJyYXlTdG9yYWdlKG5vZGUtPmluZGV4aW5nVHlwZSgpKSkgeworICAg ICAgICBpZiAoIWdsb2JhbE9iamVjdC0+aXNIYXZpbmdBQmFkVGltZSgpICYmICFoYXNBbnlBcnJh eVN0b3JhZ2Uobm9kZS0+aW5kZXhpbmdUeXBlKCkpKSB7CiAgICAgICAgICAgICBTdHJ1Y3R1cmUq IHN0cnVjdHVyZSA9IGdsb2JhbE9iamVjdC0+YXJyYXlTdHJ1Y3R1cmVGb3JJbmRleGluZ1R5cGVE dXJpbmdBbGxvY2F0aW9uKG5vZGUtPmluZGV4aW5nVHlwZSgpKTsKICAgICAgICAgICAgIEFTU0VS VChzdHJ1Y3R1cmUtPmluZGV4aW5nVHlwZSgpID09IG5vZGUtPmluZGV4aW5nVHlwZSgpKTsKICAg ICAgICAgICAgIEFTU0VSVCgKQEAgLTMzMzEsNyArMzMzMSw3IEBAIHZvaWQgU3BlY3VsYXRpdmVK SVQ6OmNvbXBpbGUoTm9kZSogbm9kZSkKIAogICAgIGNhc2UgTmV3QXJyYXlXaXRoU2l6ZTogewog ICAgICAgICBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0ID0gbV9qaXQuZ3JhcGgoKS5nbG9i YWxPYmplY3RGb3Iobm9kZS0+b3JpZ2luLnNlbWFudGljKTsKLSAgICAgICAgaWYgKCFnbG9iYWxP YmplY3QtPmlzSGF2aW5nQUJhZFRpbWUoKSAmJiAhaGFzQXJyYXlTdG9yYWdlKG5vZGUtPmluZGV4 aW5nVHlwZSgpKSkgeworICAgICAgICBpZiAoIWdsb2JhbE9iamVjdC0+aXNIYXZpbmdBQmFkVGlt ZSgpICYmICFoYXNBbnlBcnJheVN0b3JhZ2Uobm9kZS0+aW5kZXhpbmdUeXBlKCkpKSB7CiAgICAg ICAgICAgICBTcGVjdWxhdGVTdHJpY3RJbnQzMk9wZXJhbmQgc2l6ZSh0aGlzLCBub2RlLT5jaGls ZDEoKSk7CiAgICAgICAgICAgICBHUFJUZW1wb3JhcnkgcmVzdWx0KHRoaXMpOwogICAgICAgICAg ICAgR1BSVGVtcG9yYXJ5IHN0b3JhZ2UodGhpcyk7CkBAIC0zNDA1LDcgKzM0MDUsNyBAQCB2b2lk IFNwZWN1bGF0aXZlSklUOjpjb21waWxlKE5vZGUqIG5vZGUpCiAgICAgY2FzZSBOZXdBcnJheUJ1 ZmZlcjogewogICAgICAgICBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0ID0gbV9qaXQuZ3Jh cGgoKS5nbG9iYWxPYmplY3RGb3Iobm9kZS0+b3JpZ2luLnNlbWFudGljKTsKICAgICAgICAgSW5k ZXhpbmdUeXBlIGluZGV4aW5nVHlwZSA9IG5vZGUtPmluZGV4aW5nVHlwZSgpOwotICAgICAgICBp ZiAoIWdsb2JhbE9iamVjdC0+aXNIYXZpbmdBQmFkVGltZSgpICYmICFoYXNBcnJheVN0b3JhZ2Uo aW5kZXhpbmdUeXBlKSkgeworICAgICAgICBpZiAoIWdsb2JhbE9iamVjdC0+aXNIYXZpbmdBQmFk VGltZSgpICYmICFoYXNBbnlBcnJheVN0b3JhZ2UoaW5kZXhpbmdUeXBlKSkgewogICAgICAgICAg ICAgdW5zaWduZWQgbnVtRWxlbWVudHMgPSBub2RlLT5udW1Db25zdGFudHMoKTsKICAgICAgICAg ICAgIAogICAgICAgICAgICAgR1BSVGVtcG9yYXJ5IHJlc3VsdCh0aGlzKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwCmluZGV4IGM1ODEz NTcuLmRkYjI1YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3Bl Y3VsYXRpdmVKSVQ2NC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVj dWxhdGl2ZUpJVDY0LmNwcApAQCAtMzQ4NSw3ICszNDg1LDcgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJ VDo6Y29tcGlsZShOb2RlKiBub2RlKQogICAgICAgICAKICAgICBjYXNlIE5ld0FycmF5OiB7CiAg ICAgICAgIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QgPSBtX2ppdC5ncmFwaCgpLmdsb2Jh bE9iamVjdEZvcihub2RlLT5vcmlnaW4uc2VtYW50aWMpOwotICAgICAgICBpZiAoIWdsb2JhbE9i amVjdC0+aXNIYXZpbmdBQmFkVGltZSgpICYmICFoYXNBcnJheVN0b3JhZ2Uobm9kZS0+aW5kZXhp bmdUeXBlKCkpKSB7CisgICAgICAgIGlmICghZ2xvYmFsT2JqZWN0LT5pc0hhdmluZ0FCYWRUaW1l KCkgJiYgIWhhc0FueUFycmF5U3RvcmFnZShub2RlLT5pbmRleGluZ1R5cGUoKSkpIHsKICAgICAg ICAgICAgIFN0cnVjdHVyZSogc3RydWN0dXJlID0gZ2xvYmFsT2JqZWN0LT5hcnJheVN0cnVjdHVy ZUZvckluZGV4aW5nVHlwZUR1cmluZ0FsbG9jYXRpb24obm9kZS0+aW5kZXhpbmdUeXBlKCkpOwog ICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQoc3RydWN0dXJlLT5pbmRleGluZ1R5cGUoKSA9PSBu b2RlLT5pbmRleGluZ1R5cGUoKSk7CiAgICAgICAgICAgICBBU1NFUlQoCkBAIC0zNjU2LDcgKzM2 NTYsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlKE5vZGUqIG5vZGUpCiAgICAgICAg IAogICAgIGNhc2UgTmV3QXJyYXlXaXRoU2l6ZTogewogICAgICAgICBKU0dsb2JhbE9iamVjdCog Z2xvYmFsT2JqZWN0ID0gbV9qaXQuZ3JhcGgoKS5nbG9iYWxPYmplY3RGb3Iobm9kZS0+b3JpZ2lu LnNlbWFudGljKTsKLSAgICAgICAgaWYgKCFnbG9iYWxPYmplY3QtPmlzSGF2aW5nQUJhZFRpbWUo KSAmJiAhaGFzQXJyYXlTdG9yYWdlKG5vZGUtPmluZGV4aW5nVHlwZSgpKSkgeworICAgICAgICBp ZiAoIWdsb2JhbE9iamVjdC0+aXNIYXZpbmdBQmFkVGltZSgpICYmICFoYXNBbnlBcnJheVN0b3Jh Z2Uobm9kZS0+aW5kZXhpbmdUeXBlKCkpKSB7CiAgICAgICAgICAgICBTcGVjdWxhdGVTdHJpY3RJ bnQzMk9wZXJhbmQgc2l6ZSh0aGlzLCBub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgICAgICBHUFJU ZW1wb3JhcnkgcmVzdWx0KHRoaXMpOwogICAgICAgICAgICAgR1BSVGVtcG9yYXJ5IHN0b3JhZ2Uo dGhpcyk7CkBAIC0zNzI3LDcgKzM3MjcsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxl KE5vZGUqIG5vZGUpCiAgICAgY2FzZSBOZXdBcnJheUJ1ZmZlcjogewogICAgICAgICBKU0dsb2Jh bE9iamVjdCogZ2xvYmFsT2JqZWN0ID0gbV9qaXQuZ3JhcGgoKS5nbG9iYWxPYmplY3RGb3Iobm9k ZS0+b3JpZ2luLnNlbWFudGljKTsKICAgICAgICAgSW5kZXhpbmdUeXBlIGluZGV4aW5nVHlwZSA9 IG5vZGUtPmluZGV4aW5nVHlwZSgpOwotICAgICAgICBpZiAoIWdsb2JhbE9iamVjdC0+aXNIYXZp bmdBQmFkVGltZSgpICYmICFoYXNBcnJheVN0b3JhZ2UoaW5kZXhpbmdUeXBlKSkgeworICAgICAg ICBpZiAoIWdsb2JhbE9iamVjdC0+aXNIYXZpbmdBQmFkVGltZSgpICYmICFoYXNBbnlBcnJheVN0 b3JhZ2UoaW5kZXhpbmdUeXBlKSkgewogICAgICAgICAgICAgdW5zaWduZWQgbnVtRWxlbWVudHMg PSBub2RlLT5udW1Db25zdGFudHMoKTsKICAgICAgICAgICAgIAogICAgICAgICAgICAgR1BSVGVt cG9yYXJ5IHJlc3VsdCh0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHV2F0Y2hwb2ludENvbGxlY3Rpb25QaGFzZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR1dhdGNocG9pbnRDb2xsZWN0aW9uUGhhc2UuY3BwCmluZGV4IDFhYzZkOTQuLjQz ZTFiMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHV2F0Y2hwb2lu dENvbGxlY3Rpb25QaGFzZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdX YXRjaHBvaW50Q29sbGVjdGlvblBoYXNlLmNwcApAQCAtMTExLDcgKzExMSw3IEBAIHByaXZhdGU6 CiAgICAgICAgIGNhc2UgTmV3QXJyYXk6CiAgICAgICAgIGNhc2UgTmV3QXJyYXlXaXRoU2l6ZToK ICAgICAgICAgY2FzZSBOZXdBcnJheUJ1ZmZlcjoKLSAgICAgICAgICAgIGlmICghZ2xvYmFsT2Jq ZWN0KCktPmlzSGF2aW5nQUJhZFRpbWUoKSAmJiAhaGFzQXJyYXlTdG9yYWdlKG1fbm9kZS0+aW5k ZXhpbmdUeXBlKCkpKQorICAgICAgICAgICAgaWYgKCFnbG9iYWxPYmplY3QoKS0+aXNIYXZpbmdB QmFkVGltZSgpICYmICFoYXNBbnlBcnJheVN0b3JhZ2UobV9ub2RlLT5pbmRleGluZ1R5cGUoKSkp CiAgICAgICAgICAgICAgICAgYWRkTGF6aWx5KGdsb2JhbE9iamVjdCgpLT5oYXZpbmdBQmFkVGlt ZVdhdGNocG9pbnQoKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIApkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvTExWTS5jcHAgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcAppbmRleCA5YWRh NGNlLi5kM2UyOTg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExv d2VyREZHVG9MTFZNLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2Vy REZHVG9MTFZNLmNwcApAQCAtMjUwMyw3ICsyNTAzLDcgQEAgcHJpdmF0ZToKICAgICAgICAgCiAg ICAgICAgIFJFTEVBU0VfQVNTRVJUKHN0cnVjdHVyZS0+aW5kZXhpbmdUeXBlKCkgPT0gbV9ub2Rl LT5pbmRleGluZ1R5cGUoKSk7CiAgICAgICAgIAotICAgICAgICBpZiAoIWdsb2JhbE9iamVjdC0+ aXNIYXZpbmdBQmFkVGltZSgpICYmICFoYXNBcnJheVN0b3JhZ2UobV9ub2RlLT5pbmRleGluZ1R5 cGUoKSkpIHsKKyAgICAgICAgaWYgKCFnbG9iYWxPYmplY3QtPmlzSGF2aW5nQUJhZFRpbWUoKSAm JiAhaGFzQW55QXJyYXlTdG9yYWdlKG1fbm9kZS0+aW5kZXhpbmdUeXBlKCkpKSB7CiAgICAgICAg ICAgICB1bnNpZ25lZCBudW1FbGVtZW50cyA9IG1fbm9kZS0+bnVtQ2hpbGRyZW4oKTsKICAgICAg ICAgICAgIAogICAgICAgICAgICAgQXJyYXlWYWx1ZXMgYXJyYXlWYWx1ZXMgPSBhbGxvY2F0ZUpT QXJyYXkoc3RydWN0dXJlLCBudW1FbGVtZW50cyk7CkBAIC0yNTgwLDcgKzI1ODAsNyBAQCBwcml2 YXRlOgogICAgICAgICAKICAgICAgICAgUkVMRUFTRV9BU1NFUlQoc3RydWN0dXJlLT5pbmRleGlu Z1R5cGUoKSA9PSBtX25vZGUtPmluZGV4aW5nVHlwZSgpKTsKICAgICAgICAgCi0gICAgICAgIGlm ICghZ2xvYmFsT2JqZWN0LT5pc0hhdmluZ0FCYWRUaW1lKCkgJiYgIWhhc0FycmF5U3RvcmFnZSht X25vZGUtPmluZGV4aW5nVHlwZSgpKSkgeworICAgICAgICBpZiAoIWdsb2JhbE9iamVjdC0+aXNI YXZpbmdBQmFkVGltZSgpICYmICFoYXNBbnlBcnJheVN0b3JhZ2UobV9ub2RlLT5pbmRleGluZ1R5 cGUoKSkpIHsKICAgICAgICAgICAgIHVuc2lnbmVkIG51bUVsZW1lbnRzID0gbV9ub2RlLT5udW1D b25zdGFudHMoKTsKICAgICAgICAgICAgIAogICAgICAgICAgICAgQXJyYXlWYWx1ZXMgYXJyYXlW YWx1ZXMgPSBhbGxvY2F0ZUpTQXJyYXkoc3RydWN0dXJlLCBudW1FbGVtZW50cyk7CkBAIC0yNjE3 LDcgKzI2MTcsNyBAQCBwcml2YXRlOgogICAgICAgICBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSA9IGds b2JhbE9iamVjdC0+YXJyYXlTdHJ1Y3R1cmVGb3JJbmRleGluZ1R5cGVEdXJpbmdBbGxvY2F0aW9u KAogICAgICAgICAgICAgbV9ub2RlLT5pbmRleGluZ1R5cGUoKSk7CiAgICAgICAgIAotICAgICAg ICBpZiAoIWdsb2JhbE9iamVjdC0+aXNIYXZpbmdBQmFkVGltZSgpICYmICFoYXNBcnJheVN0b3Jh Z2UobV9ub2RlLT5pbmRleGluZ1R5cGUoKSkpIHsKKyAgICAgICAgaWYgKCFnbG9iYWxPYmplY3Qt PmlzSGF2aW5nQUJhZFRpbWUoKSAmJiAhaGFzQW55QXJyYXlTdG9yYWdlKG1fbm9kZS0+aW5kZXhp bmdUeXBlKCkpKSB7CiAgICAgICAgICAgICBBU1NFUlQoCiAgICAgICAgICAgICAgICAgaGFzVW5k ZWNpZGVkKHN0cnVjdHVyZS0+aW5kZXhpbmdUeXBlKCkpCiAgICAgICAgICAgICAgICAgfHwgaGFz SW50MzIoc3RydWN0dXJlLT5pbmRleGluZ1R5cGUoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0J1dHRlcmZseUlubGluZXMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0J1dHRlcmZseUlubGluZXMuaAppbmRleCBlNTBiNTQyLi4zZmQ4ZGMxIDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9CdXR0ZXJmbHlJbmxpbmVz LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQnV0dGVyZmx5SW5saW5lcy5o CkBAIC0xNjcsNyArMTY3LDcgQEAgaW5saW5lIEJ1dHRlcmZseSogQnV0dGVyZmx5OjpyZXNpemVB cnJheSgKIAogaW5saW5lIEJ1dHRlcmZseSogQnV0dGVyZmx5Ojp1bnNoaWZ0KFN0cnVjdHVyZSog c3RydWN0dXJlLCBzaXplX3QgbnVtYmVyT2ZTbG90cykKIHsKLSAgICBBU1NFUlQoaGFzQXJyYXlT dG9yYWdlKHN0cnVjdHVyZS0+aW5kZXhpbmdUeXBlKCkpKTsKKyAgICBBU1NFUlQoaGFzQW55QXJy YXlTdG9yYWdlKHN0cnVjdHVyZS0+aW5kZXhpbmdUeXBlKCkpKTsKICAgICBBU1NFUlQobnVtYmVy T2ZTbG90cyA8PSBpbmRleGluZ0hlYWRlcigpLT5wcmVDYXBhY2l0eShzdHJ1Y3R1cmUpKTsKICAg ICB1bnNpZ25lZCBwcm9wZXJ0eUNhcGFjaXR5ID0gc3RydWN0dXJlLT5vdXRPZkxpbmVDYXBhY2l0 eSgpOwogICAgIC8vIEZJWE1FOiBJdCB3b3VsZCBwcm9iYWJseSBiZSB3aXNlIHRvIHJld3JpdGUg dGhpcyBhcyBhIGxvb3Agc2luY2UgKDEpIHdlIGtub3cgaW4gd2hpY2gKQEAgLTE4Niw3ICsxODYs NyBAQCBpbmxpbmUgQnV0dGVyZmx5KiBCdXR0ZXJmbHk6OnVuc2hpZnQoU3RydWN0dXJlKiBzdHJ1 Y3R1cmUsIHNpemVfdCBudW1iZXJPZlNsb3RzKQogCiBpbmxpbmUgQnV0dGVyZmx5KiBCdXR0ZXJm bHk6OnNoaWZ0KFN0cnVjdHVyZSogc3RydWN0dXJlLCBzaXplX3QgbnVtYmVyT2ZTbG90cykKIHsK LSAgICBBU1NFUlQoaGFzQXJyYXlTdG9yYWdlKHN0cnVjdHVyZS0+aW5kZXhpbmdUeXBlKCkpKTsK KyAgICBBU1NFUlQoaGFzQW55QXJyYXlTdG9yYWdlKHN0cnVjdHVyZS0+aW5kZXhpbmdUeXBlKCkp KTsKICAgICB1bnNpZ25lZCBwcm9wZXJ0eUNhcGFjaXR5ID0gc3RydWN0dXJlLT5vdXRPZkxpbmVD YXBhY2l0eSgpOwogICAgIC8vIEZJWE1FOiBTZWUgY29tbWVudCBpbiB1bnNoaWZ0KCksIGFib3Zl LgogICAgIG1lbW1vdmUoCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9JbmRleGluZ0hlYWRlcklubGluZXMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0luZGV4aW5nSGVhZGVySW5saW5lcy5oCmluZGV4IGNmYWQxYzguLmIxODg3NDEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0luZGV4aW5nSGVhZGVySW5saW5lcy5o CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0luZGV4aW5nSGVhZGVySW5saW5l cy5oCkBAIC0zNCw3ICszNCw3IEBAIG5hbWVzcGFjZSBKU0MgewogCiBpbmxpbmUgc2l6ZV90IElu ZGV4aW5nSGVhZGVyOjpwcmVDYXBhY2l0eShTdHJ1Y3R1cmUqIHN0cnVjdHVyZSkKIHsKLSAgICBp ZiAoTElLRUxZKCFoYXNBcnJheVN0b3JhZ2Uoc3RydWN0dXJlLT5pbmRleGluZ1R5cGUoKSkpKQor ICAgIGlmIChMSUtFTFkoIWhhc0FueUFycmF5U3RvcmFnZShzdHJ1Y3R1cmUtPmluZGV4aW5nVHlw ZSgpKSkpCiAgICAgICAgIHJldHVybiAwOwogICAgIAogICAgIHJldHVybiBhcnJheVN0b3JhZ2Uo KS0+bV9pbmRleEJpYXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9JbmRleGluZ1R5cGUuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0luZGV4aW5n VHlwZS5oCmluZGV4IDY2YTc1ZjguLjI1ZDVhMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0luZGV4aW5nVHlwZS5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0luZGV4aW5nVHlwZS5oCkBAIC0xMjEsMTQgKzEyMSwxMiBAQCBzdGF0aWMgaW5s aW5lIGJvb2wgaGFzQ29udGlndW91cyhJbmRleGluZ1R5cGUgaW5kZXhpbmdUeXBlKQogICAgIHJl dHVybiAoaW5kZXhpbmdUeXBlICYgSW5kZXhpbmdTaGFwZU1hc2spID09IENvbnRpZ3VvdXNTaGFw ZTsKIH0KIAotLy8gRklYTUU6IFRoaXMgaXMgYW4gYXdrd2FyZCBuYW1lLiBUaGlzIHNob3VsZCBy ZWFsbHkgYmUgY2FsbGVkIGhhc0FycmF5U3RvcmFnZSgpCi0vLyBhbmQgdGhlbiBuZXh0IG1ldGhv ZCBkb3duIHNob3VsZCBiZSBjYWxsZWQgaGFzQW55QXJyYXlTdG9yYWdlKCkuCi1zdGF0aWMgaW5s aW5lIGJvb2wgaGFzRmFzdEFycmF5U3RvcmFnZShJbmRleGluZ1R5cGUgaW5kZXhpbmdUeXBlKQor c3RhdGljIGlubGluZSBib29sIGhhc0FycmF5U3RvcmFnZShJbmRleGluZ1R5cGUgaW5kZXhpbmdU eXBlKQogewogICAgIHJldHVybiAoaW5kZXhpbmdUeXBlICYgSW5kZXhpbmdTaGFwZU1hc2spID09 IEFycmF5U3RvcmFnZVNoYXBlOwogfQogCi1zdGF0aWMgaW5saW5lIGJvb2wgaGFzQXJyYXlTdG9y YWdlKEluZGV4aW5nVHlwZSBpbmRleGluZ1R5cGUpCitzdGF0aWMgaW5saW5lIGJvb2wgaGFzQW55 QXJyYXlTdG9yYWdlKEluZGV4aW5nVHlwZSBpbmRleGluZ1R5cGUpCiB7CiAgICAgcmV0dXJuIHN0 YXRpY19jYXN0PHVpbnQ4X3Q+KChpbmRleGluZ1R5cGUgJiBJbmRleGluZ1NoYXBlTWFzaykgLSBB cnJheVN0b3JhZ2VTaGFwZSkgPD0gc3RhdGljX2Nhc3Q8dWludDhfdD4oU2xvd1B1dEFycmF5U3Rv cmFnZVNoYXBlIC0gQXJyYXlTdG9yYWdlU2hhcGUpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNBcnJheS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9KU0FycmF5LmNwcAppbmRleCBiZTMwZDE4Li43ZTg5MGYzIDEwMDY0NAotLS0gYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0FycmF5LmNwcAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9KU0FycmF5LmNwcApAQCAtMTQ0NSw3ICsxNDQ1LDcgQEAgdm9p ZCBKU0FycmF5Ojpzb3J0VmVjdG9yKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBjb21wYXJlRnVu Y3Rpb24sIENhbGxUeXBlIGNhbGwKICAgICAgICAgICAgIGN1cnJlbnRJbmRleGluZ0RhdGEoKVtp XS5jbGVhcigpOwogICAgIH0KICAgICAKLSAgICBpZiAoaGFzQXJyYXlTdG9yYWdlKGluZGV4aW5n VHlwZSgpKSkKKyAgICBpZiAoaGFzQW55QXJyYXlTdG9yYWdlKGluZGV4aW5nVHlwZSgpKSkKICAg ICAgICAgYXJyYXlTdG9yYWdlKCktPm1fbnVtVmFsdWVzSW5WZWN0b3IgPSBuZXdVc2VkVmVjdG9y TGVuZ3RoOwogfQogCkBAIC0xNjY1LDcgKzE2NjUsNyBAQCB2b2lkIEpTQXJyYXk6OmNvbXBhY3RG b3JTb3J0aW5nKHVuc2lnbmVkJiBudW1EZWZpbmVkLCB1bnNpZ25lZCYgbmV3UmVsZXZhbnRMZW5n dAogICAgICAgICAKICAgICBuZXdSZWxldmFudExlbmd0aCA9IG51bURlZmluZWQgKyBudW1VbmRl ZmluZWQ7CiAgICAgCi0gICAgaWYgKGhhc0FycmF5U3RvcmFnZShhcnJheUluZGV4aW5nVHlwZSkp CisgICAgaWYgKGhhc0FueUFycmF5U3RvcmFnZShhcnJheUluZGV4aW5nVHlwZSkpCiAgICAgICAg IFJFTEVBU0VfQVNTRVJUKCFhcnJheVN0b3JhZ2UoKS0+bV9zcGFyc2VNYXApOwogICAgIAogICAg IHN3aXRjaCAoYXJyYXlJbmRleGluZ1R5cGUpIHsKQEAgLTE2ODksNyArMTY4OSw3IEBAIHZvaWQg SlNBcnJheTo6Y29tcGFjdEZvclNvcnRpbmcodW5zaWduZWQmIG51bURlZmluZWQsIHVuc2lnbmVk JiBuZXdSZWxldmFudExlbmd0CiAgICAgICAgICAgICBpbmRleGluZ0RhdGE8YXJyYXlJbmRleGlu Z1R5cGU+KClbaV0uY2xlYXIoKTsKICAgICB9CiAKLSAgICBpZiAoaGFzQXJyYXlTdG9yYWdlKGFy cmF5SW5kZXhpbmdUeXBlKSkKKyAgICBpZiAoaGFzQW55QXJyYXlTdG9yYWdlKGFycmF5SW5kZXhp bmdUeXBlKSkKICAgICAgICAgYXJyYXlTdG9yYWdlKCktPm1fbnVtVmFsdWVzSW5WZWN0b3IgPSBu ZXdSZWxldmFudExlbmd0aDsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSlNBcnJheS5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNBcnJh eS5oCmluZGV4IGZlZDkxY2YuLjRmYzc3ZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0pTQXJyYXkuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9KU0FycmF5LmgKQEAgLTIwOCw3ICsyMDgsNyBAQCBCdXR0ZXJmbHkqIGNyZWF0ZUFycmF5QnV0 dGVyZmx5SW5EaWN0aW9uYXJ5SW5kZXhpbmdNb2RlKAogaW5saW5lIEpTQXJyYXkqIEpTQXJyYXk6 OmNyZWF0ZShWTSYgdm0sIFN0cnVjdHVyZSogc3RydWN0dXJlLCB1bnNpZ25lZCBpbml0aWFsTGVu Z3RoKQogewogICAgIEJ1dHRlcmZseSogYnV0dGVyZmx5OwotICAgIGlmIChMSUtFTFkoIWhhc0Fy cmF5U3RvcmFnZShzdHJ1Y3R1cmUtPmluZGV4aW5nVHlwZSgpKSkpIHsKKyAgICBpZiAoTElLRUxZ KCFoYXNBbnlBcnJheVN0b3JhZ2Uoc3RydWN0dXJlLT5pbmRleGluZ1R5cGUoKSkpKSB7CiAgICAg ICAgIEFTU0VSVCgKICAgICAgICAgICAgIGhhc1VuZGVjaWRlZChzdHJ1Y3R1cmUtPmluZGV4aW5n VHlwZSgpKQogICAgICAgICAgICAgfHwgaGFzSW50MzIoc3RydWN0dXJlLT5pbmRleGluZ1R5cGUo KSkKQEAgLTIzOSw3ICsyMzksNyBAQCBpbmxpbmUgSlNBcnJheSogSlNBcnJheTo6dHJ5Q3JlYXRl VW5pbml0aWFsaXplZChWTSYgdm0sIFN0cnVjdHVyZSogc3RydWN0dXJlLCB1bgogICAgICAgICBy ZXR1cm4gMDsKICAgICAgICAgCiAgICAgQnV0dGVyZmx5KiBidXR0ZXJmbHk7Ci0gICAgaWYgKExJ S0VMWSghaGFzQXJyYXlTdG9yYWdlKHN0cnVjdHVyZS0+aW5kZXhpbmdUeXBlKCkpKSkgeworICAg IGlmIChMSUtFTFkoIWhhc0FueUFycmF5U3RvcmFnZShzdHJ1Y3R1cmUtPmluZGV4aW5nVHlwZSgp KSkpIHsKICAgICAgICAgQVNTRVJUKAogICAgICAgICAgICAgaGFzVW5kZWNpZGVkKHN0cnVjdHVy ZS0+aW5kZXhpbmdUeXBlKCkpCiAgICAgICAgICAgICB8fCBoYXNJbnQzMihzdHJ1Y3R1cmUtPmlu ZGV4aW5nVHlwZSgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv SlNHbG9iYWxPYmplY3QuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9i YWxPYmplY3QuY3BwCmluZGV4IGZjYjU1ZWEuLjk3NDAxZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5jcHAKQEAgLTUxMSw3ICs1MTEsNyBA QCBpbmxpbmUgYm9vbCBoYXNCcm9rZW5JbmRleGluZyhKU09iamVjdCogb2JqZWN0KQogICAgIElu ZGV4aW5nVHlwZSB0eXBlID0gb2JqZWN0LT5zdHJ1Y3R1cmUoKS0+aW5kZXhpbmdUeXBlKCk7CiAg ICAgLy8gVGhpcyBjb3VsZCBiZSBtYWRlIG9idmlvdXNseSBtb3JlIGVmZmljaWVudCwgYnV0IGlz bid0IG1hZGUgc28gcmlnaHQgbm93LCBiZWNhdXNlCiAgICAgLy8gd2UgZXhwZWN0IHRoaXMgdG8g YmUgYW4gdW5saWtlbHkgc2xvdyBwYXRoIGFueXdheS4KLSAgICByZXR1cm4gaGFzVW5kZWNpZGVk KHR5cGUpIHx8IGhhc0ludDMyKHR5cGUpIHx8IGhhc0RvdWJsZSh0eXBlKSB8fCBoYXNDb250aWd1 b3VzKHR5cGUpIHx8IGhhc0Zhc3RBcnJheVN0b3JhZ2UodHlwZSk7CisgICAgcmV0dXJuIGhhc1Vu ZGVjaWRlZCh0eXBlKSB8fCBoYXNJbnQzMih0eXBlKSB8fCBoYXNEb3VibGUodHlwZSkgfHwgaGFz Q29udGlndW91cyh0eXBlKSB8fCBoYXNBcnJheVN0b3JhZ2UodHlwZSk7CiB9CiAKIHZvaWQgT2Jq ZWN0c1dpdGhCcm9rZW5JbmRleGluZ0ZpbmRlcjo6b3BlcmF0b3IoKShKU0NlbGwqIGNlbGwpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAKaW5kZXggNTljMjk5ZS4u NjBjZDU5ZiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmpl Y3QuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcApA QCAtMjA3Myw3ICsyMDczLDcgQEAgYm9vbCBKU09iamVjdDo6cHV0RGlyZWN0SW5kZXhCZXlvbmRW ZWN0b3JMZW5ndGhXaXRoQXJyYXlTdG9yYWdlKEV4ZWNTdGF0ZSogZXhlYywKICAgICBWTSYgdm0g PSBleGVjLT52bSgpOwogICAgIAogICAgIC8vIGkgc2hvdWxkIGJlIGEgdmFsaWQgYXJyYXkgaW5k ZXggdGhhdCBpcyBvdXRzaWRlIG9mIHRoZSBjdXJyZW50IHZlY3Rvci4KLSAgICBBU1NFUlQoaGFz QXJyYXlTdG9yYWdlKGluZGV4aW5nVHlwZSgpKSk7CisgICAgQVNTRVJUKGhhc0FueUFycmF5U3Rv cmFnZShpbmRleGluZ1R5cGUoKSkpOwogICAgIEFTU0VSVChhcnJheVN0b3JhZ2UoKSA9PSBzdG9y YWdlKTsKICAgICBBU1NFUlQoaSA+PSBzdG9yYWdlLT52ZWN0b3JMZW5ndGgoKSB8fCBhdHRyaWJ1 dGVzKTsKICAgICBBU1NFUlQoaSA8PSBNQVhfQVJSQVlfSU5ERVgpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuaCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0pTT2JqZWN0LmgKaW5kZXggMzM4ZDNkYi4uMjg2NmZhNSAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuaAorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5oCkBAIC02OTcsOSArNjk3LDkgQEAgcHVi bGljOgogICAgIC8vIGFscmVhZHkuCiAgICAgQXJyYXlTdG9yYWdlKiBlbnN1cmVBcnJheVN0b3Jh Z2UoVk0mIHZtKQogICAgIHsKLSAgICAgICAgaWYgKExJS0VMWShoYXNBcnJheVN0b3JhZ2UoaW5k ZXhpbmdUeXBlKCkpKSkKKyAgICAgICAgaWYgKExJS0VMWShoYXNBbnlBcnJheVN0b3JhZ2UoaW5k ZXhpbmdUeXBlKCkpKSkKICAgICAgICAgICAgIHJldHVybiBtX2J1dHRlcmZseS0+YXJyYXlTdG9y YWdlKCk7Ci0gICAgICAgICAgICAKKwogICAgICAgICByZXR1cm4gZW5zdXJlQXJyYXlTdG9yYWdl U2xvdyh2bSk7CiAgICAgfQogICAgICAgICAKQEAgLTc0NSw3ICs3NDUsNyBAQCBwcm90ZWN0ZWQ6 CiAgICAgLy8gc3RvcmFnZS4gVGhpcyB3aWxsIGFzc2VydCBvdGhlcndpc2UuCiAgICAgQXJyYXlT dG9yYWdlKiBhcnJheVN0b3JhZ2UoKQogICAgIHsKLSAgICAgICAgQVNTRVJUKGhhc0FycmF5U3Rv cmFnZShpbmRleGluZ1R5cGUoKSkpOworICAgICAgICBBU1NFUlQoaGFzQW55QXJyYXlTdG9yYWdl KGluZGV4aW5nVHlwZSgpKSk7CiAgICAgICAgIHJldHVybiBtX2J1dHRlcmZseS0+YXJyYXlTdG9y YWdlKCk7CiAgICAgfQogICAgICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL1N0cnVjdHVyZVRyYW5zaXRpb25UYWJsZS5oIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvU3RydWN0dXJlVHJhbnNpdGlvblRhYmxlLmgKaW5kZXggNGJhNjRiNS4uMjdj MGE3OSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJl VHJhbnNpdGlvblRhYmxlLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3Ry dWN0dXJlVHJhbnNpdGlvblRhYmxlLmgKQEAgLTc5LDcgKzc5LDcgQEAgaW5saW5lIEluZGV4aW5n VHlwZSBuZXdJbmRleGluZ1R5cGUoSW5kZXhpbmdUeXBlIG9sZFR5cGUsIE5vblByb3BlcnR5VHJh bnNpdGlvbgogICAgICAgICBBU1NFUlQoIWhhc0luZGV4ZWRQcm9wZXJ0aWVzKG9sZFR5cGUpIHx8 IGhhc1VuZGVjaWRlZChvbGRUeXBlKSB8fCBoYXNJbnQzMihvbGRUeXBlKSB8fCBoYXNEb3VibGUo b2xkVHlwZSkgfHwgaGFzQ29udGlndW91cyhvbGRUeXBlKSB8fCBoYXNDb250aWd1b3VzKG9sZFR5 cGUpKTsKICAgICAgICAgcmV0dXJuIChvbGRUeXBlICYgfkluZGV4aW5nU2hhcGVNYXNrKSB8IFNs b3dQdXRBcnJheVN0b3JhZ2VTaGFwZTsKICAgICBjYXNlIFN3aXRjaFRvU2xvd1B1dEFycmF5U3Rv cmFnZToKLSAgICAgICAgQVNTRVJUKGhhc0Zhc3RBcnJheVN0b3JhZ2Uob2xkVHlwZSkpOworICAg ICAgICBBU1NFUlQoaGFzQXJyYXlTdG9yYWdlKG9sZFR5cGUpKTsKICAgICAgICAgcmV0dXJuIChv bGRUeXBlICYgfkluZGV4aW5nU2hhcGVNYXNrKSB8IFNsb3dQdXRBcnJheVN0b3JhZ2VTaGFwZTsK ICAgICBjYXNlIEFkZEluZGV4ZWRBY2Nlc3NvcnM6CiAgICAgICAgIHJldHVybiBvbGRUeXBlIHwg TWF5SGF2ZUluZGV4ZWRBY2Nlc3NvcnM7Cg==