138790 2014-11-16 23:54:07 -0800 Fix two bad function names of HTMLFormControlElement 2014-11-17 20:30:01 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin darin oldest_to_newest 1049138 0 benjamin 2014-11-16 23:54:07 -0800 Fix two bad function names of HTMLFormControlElement 1049139 1 241695 benjamin 2014-11-16 23:56:47 -0800 Created attachment 241695 Patch 1049321 2 241695 kling 2014-11-17 14:37:51 -0800 Comment on attachment 241695 Patch r=me 1049386 3 241695 benjamin 2014-11-17 20:29:57 -0800 Comment on attachment 241695 Patch Clearing flags on attachment: 241695 Committed r176250: <http://trac.webkit.org/changeset/176250> 1049387 4 benjamin 2014-11-17 20:30:01 -0800 All reviewed patches have been landed. Closing bug. 241695 2014-11-16 23:56:47 -0800 2014-11-17 20:29:57 -0800 Patch bug-138790-20141116235656.patch text/plain 25880 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2MTc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTUzMGRkNDNjNjg4YWJj YWMzNjJhN2RhZTRjM2UxYzBhYTRjMWQ2ZC4uNjZkYjNmMzQ2OGFiNjc0NzljOGVjYmRkNTI0ZTZm MjYyOWE0NGFhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDcyIEBACiAyMDE0LTExLTE2ICBCZW5q YW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KIAorICAgICAgICBGaXggdHdvIGJh ZCBmdW5jdGlvbiBuYW1lcyBvZiBIVE1MRm9ybUNvbnRyb2xFbGVtZW50CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg3OTAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEYXJpbiBzdWdnZXN0ZWQgc29tZSBu YW1lIGltcHJvdmVtZW50cyBpbiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTM4NzY5CisKKyAgICAgICAgKiBkb20vQ2hlY2tlZFJhZGlvQnV0dG9ucy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSYWRpb0J1dHRvbkdyb3VwOjphZGQpOgorICAgICAgICAoV2ViQ29yZTo6 UmFkaW9CdXR0b25Hcm91cDo6dXBkYXRlQ2hlY2tlZFN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6 OlJhZGlvQnV0dG9uR3JvdXA6OnJlcXVpcmVkQXR0cmlidXRlQ2hhbmdlZCk6CisgICAgICAgIChX ZWJDb3JlOjpSYWRpb0J1dHRvbkdyb3VwOjpyZW1vdmUpOgorICAgICAgICAoV2ViQ29yZTo6UmFk aW9CdXR0b25Hcm91cDo6dXBkYXRlVmFsaWRpdHlGb3JBbGxCdXR0b25zKToKKyAgICAgICAgKFdl YkNvcmU6OlJhZGlvQnV0dG9uR3JvdXA6OnNldE5lZWRzVmFsaWRpdHlDaGVja0ZvckFsbEJ1dHRv bnMpOiBEZWxldGVkLgorICAgICAgICAqIGh0bWwvRmlsZUlucHV0VHlwZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpGaWxlSW5wdXRUeXBlOjpzZXRGaWxlcyk6CisgICAgICAgICogaHRtbC9IVE1M QnV0dG9uRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQnV0dG9uRWxlbWVudDo6 Y29tcHV0ZVdpbGxWYWxpZGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQnV0dG9uRWxlbWVu dDo6cmVjYWxjV2lsbFZhbGlkYXRlKTogRGVsZXRlZC4KKyAgICAgICAgKiBodG1sL0hUTUxCdXR0 b25FbGVtZW50Lmg6CisgICAgICAgICogaHRtbC9IVE1MRmllbGRTZXRFbGVtZW50Lmg6CisgICAg ICAgICogaHRtbC9IVE1MRm9ybUNvbnRyb2xFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxGb3JtQ29udHJvbEVsZW1lbnQ6OnJlcXVpcmVkQXR0cmlidXRlQ2hhbmdlZCk6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MRm9ybUNvbnRyb2xFbGVtZW50Ojpjb21wdXRlV2lsbFZhbGlkYXRl KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxGb3JtQ29udHJvbEVsZW1lbnQ6OndpbGxWYWxpZGF0 ZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRm9ybUNvbnRyb2xFbGVtZW50OjpzZXROZWVkc1dp bGxWYWxpZGF0ZUNoZWNrKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxGb3JtQ29udHJvbEVsZW1l bnQ6OmlzVmFsaWRGb3JtQ29udHJvbEVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEZv cm1Db250cm9sRWxlbWVudDo6dXBkYXRlVmFsaWRpdHkpOgorICAgICAgICAoV2ViQ29yZTo6SFRN TEZvcm1Db250cm9sRWxlbWVudDo6c2V0Q3VzdG9tVmFsaWRpdHkpOgorICAgICAgICAoV2ViQ29y ZTo6SFRNTEZvcm1Db250cm9sRWxlbWVudDo6cmVjYWxjV2lsbFZhbGlkYXRlKTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6OkhUTUxGb3JtQ29udHJvbEVsZW1lbnQ6OnNldE5lZWRzVmFsaWRp dHlDaGVjayk6IERlbGV0ZWQuCisgICAgICAgICogaHRtbC9IVE1MRm9ybUNvbnRyb2xFbGVtZW50 Lmg6CisgICAgICAgICogaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxJbnB1dEVsZW1lbnQ6OnJ1blBvc3RUeXBlVXBkYXRlVGFza3MpOgorICAgICAgICAo V2ViQ29yZTo6SFRNTElucHV0RWxlbWVudDo6cGFyc2VBdHRyaWJ1dGUpOgorICAgICAgICAoV2Vi Q29yZTo6SFRNTElucHV0RWxlbWVudDo6c2V0Q2hlY2tlZCk6CisgICAgICAgIChXZWJDb3JlOjpI VE1MSW5wdXRFbGVtZW50OjpzZXRWYWx1ZUludGVybmFsKToKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxJbnB1dEVsZW1lbnQ6OnNldFZhbHVlRnJvbVJlbmRlcmVyKToKKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxJbnB1dEVsZW1lbnQ6OmNvbXB1dGVXaWxsVmFsaWRhdGUpOgorICAgICAgICAoV2ViQ29y ZTo6SFRNTElucHV0RWxlbWVudDo6cGFyc2VNYXhMZW5ndGhBdHRyaWJ1dGUpOgorICAgICAgICAo V2ViQ29yZTo6SFRNTElucHV0RWxlbWVudDo6cmVjYWxjV2lsbFZhbGlkYXRlKTogRGVsZXRlZC4K KyAgICAgICAgKiBodG1sL0hUTUxJbnB1dEVsZW1lbnQuaDoKKyAgICAgICAgKiBodG1sL0hUTUxL ZXlnZW5FbGVtZW50Lmg6CisgICAgICAgICogaHRtbC9IVE1MT3V0cHV0RWxlbWVudC5oOgorICAg ICAgICAqIGh0bWwvSFRNTFNlbGVjdEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRN TFNlbGVjdEVsZW1lbnQ6OmRlc2VsZWN0SXRlbXMpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFNl bGVjdEVsZW1lbnQ6Om9wdGlvblNlbGVjdGVkQnlVc2VyKToKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxTZWxlY3RFbGVtZW50OjpsaXN0Qm94U2VsZWN0SXRlbSk6CisgICAgICAgIChXZWJDb3JlOjpI VE1MU2VsZWN0RWxlbWVudDo6YWRkKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxTZWxlY3RFbGVt ZW50OjpwYXJzZUF0dHJpYnV0ZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MU2VsZWN0RWxlbWVu dDo6Y2hpbGRyZW5DaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxTZWxlY3RFbGVtZW50 OjpvcHRpb25FbGVtZW50Q2hpbGRyZW5DaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxT ZWxlY3RFbGVtZW50OjpzZXRMZW5ndGgpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFNlbGVjdEVs ZW1lbnQ6OnNlbGVjdEFsbCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MU2VsZWN0RWxlbWVudDo6 dXBkYXRlTGlzdEJveFNlbGVjdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MU2VsZWN0RWxl bWVudDo6c2VsZWN0T3B0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxTZWxlY3RFbGVtZW50 OjpyZXN0b3JlRm9ybUNvbnRyb2xTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MU2VsZWN0 RWxlbWVudDo6cGFyc2VNdWx0aXBsZUF0dHJpYnV0ZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1M U2VsZWN0RWxlbWVudDo6cmVzZXQpOgorICAgICAgICAqIGh0bWwvSFRNTFRleHRBcmVhRWxlbWVu dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVGV4dEFyZWFFbGVtZW50OjpwYXJzZUF0dHJp YnV0ZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVGV4dEFyZWFFbGVtZW50OjpzdWJ0cmVlSGFz Q2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVGV4dEFyZWFFbGVtZW50OjpzZXRWYWx1 ZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVGV4dEFyZWFFbGVtZW50OjpzZXROb25EaXJ0eVZh bHVlKToKKworMjAxNC0xMS0xNiAgQmVuamFtaW4gUG91bGFpbiAgPGJlbmphbWluQHdlYmtpdC5v cmc+CisKICAgICAgICAgSW1wbGVtZW50IDp2YWxpZCBhbmQgOmludmFsaWQgbWF0Y2hpbmcgZm9y IHRoZSBmaWVsZHNldCBlbGVtZW50CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzg3NjkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0No ZWNrZWRSYWRpb0J1dHRvbnMuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0NoZWNrZWRSYWRpb0J1 dHRvbnMuY3BwCmluZGV4IGU0ODFjN2RiNGIwOWQ3OThiYWUyMjFlYjA4NmM1ZDA5NGU1ZDY1YmMu LmRmNjNmMjA2NTBlY2NkZWZkZGEyZWU2MDEyMTM0NzE3MDZlNTc0NjYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9DaGVja2VkUmFkaW9CdXR0b25zLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vQ2hlY2tlZFJhZGlvQnV0dG9ucy5jcHAKQEAgLTQwLDcgKzQwLDcgQEAgcHVibGlj OgogICAgIGJvb2wgY29udGFpbnMoSFRNTElucHV0RWxlbWVudCopIGNvbnN0OwogCiBwcml2YXRl OgotICAgIHZvaWQgc2V0TmVlZHNWYWxpZGl0eUNoZWNrRm9yQWxsQnV0dG9ucygpOworICAgIHZv aWQgdXBkYXRlVmFsaWRpdHlGb3JBbGxCdXR0b25zKCk7CiAgICAgYm9vbCBpc1ZhbGlkKCkgY29u c3Q7CiAgICAgdm9pZCBzZXRDaGVja2VkQnV0dG9uKEhUTUxJbnB1dEVsZW1lbnQqKTsKIApAQCAt ODMsMTEgKzgzLDExIEBAIHZvaWQgUmFkaW9CdXR0b25Hcm91cDo6YWRkKEhUTUxJbnB1dEVsZW1l bnQqIGJ1dHRvbikKIAogICAgIGJvb2wgZ3JvdXBJc1ZhbGlkID0gaXNWYWxpZCgpOwogICAgIGlm IChncm91cFdhc1ZhbGlkICE9IGdyb3VwSXNWYWxpZCkKLSAgICAgICAgc2V0TmVlZHNWYWxpZGl0 eUNoZWNrRm9yQWxsQnV0dG9ucygpOworICAgICAgICB1cGRhdGVWYWxpZGl0eUZvckFsbEJ1dHRv bnMoKTsKICAgICBlbHNlIGlmICghZ3JvdXBJc1ZhbGlkKSB7CiAgICAgICAgIC8vIEEgcmFkaW8g YnV0dG9uIG5vdCBpbiBhIGdyb3VwIGlzIGFsd2F5cyB2YWxpZC4gV2UgbmVlZCB0byBtYWtlIGl0 CiAgICAgICAgIC8vIGludmFsaWQgb25seSBpZiB0aGUgZ3JvdXAgaXMgaW52YWxpZC4KLSAgICAg ICAgYnV0dG9uLT5zZXROZWVkc1ZhbGlkaXR5Q2hlY2soKTsKKyAgICAgICAgYnV0dG9uLT51cGRh dGVWYWxpZGl0eSgpOwogICAgIH0KIH0KIApAQCAtMTAzLDcgKzEwMyw3IEBAIHZvaWQgUmFkaW9C dXR0b25Hcm91cDo6dXBkYXRlQ2hlY2tlZFN0YXRlKEhUTUxJbnB1dEVsZW1lbnQqIGJ1dHRvbikK ICAgICAgICAgICAgIG1fY2hlY2tlZEJ1dHRvbiA9IDA7CiAgICAgfQogICAgIGlmICh3YXNWYWxp ZCAhPSBpc1ZhbGlkKCkpCi0gICAgICAgIHNldE5lZWRzVmFsaWRpdHlDaGVja0ZvckFsbEJ1dHRv bnMoKTsKKyAgICAgICAgdXBkYXRlVmFsaWRpdHlGb3JBbGxCdXR0b25zKCk7CiB9CiAKIHZvaWQg UmFkaW9CdXR0b25Hcm91cDo6cmVxdWlyZWRBdHRyaWJ1dGVDaGFuZ2VkKEhUTUxJbnB1dEVsZW1l bnQqIGJ1dHRvbikKQEAgLTExOCw3ICsxMTgsNyBAQCB2b2lkIFJhZGlvQnV0dG9uR3JvdXA6OnJl cXVpcmVkQXR0cmlidXRlQ2hhbmdlZChIVE1MSW5wdXRFbGVtZW50KiBidXR0b24pCiAgICAgICAg IC0tbV9yZXF1aXJlZENvdW50OwogICAgIH0KICAgICBpZiAod2FzVmFsaWQgIT0gaXNWYWxpZCgp KQotICAgICAgICBzZXROZWVkc1ZhbGlkaXR5Q2hlY2tGb3JBbGxCdXR0b25zKCk7CisgICAgICAg IHVwZGF0ZVZhbGlkaXR5Rm9yQWxsQnV0dG9ucygpOwogfQogCiB2b2lkIFJhZGlvQnV0dG9uR3Jv dXA6OnJlbW92ZShIVE1MSW5wdXRFbGVtZW50KiBidXR0b24pCkBAIC0xNDAsMjIgKzE0MCwyMiBA QCB2b2lkIFJhZGlvQnV0dG9uR3JvdXA6OnJlbW92ZShIVE1MSW5wdXRFbGVtZW50KiBidXR0b24p CiAgICAgICAgIEFTU0VSVCghbV9yZXF1aXJlZENvdW50KTsKICAgICAgICAgQVNTRVJUKCFtX2No ZWNrZWRCdXR0b24pOwogICAgIH0gZWxzZSBpZiAod2FzVmFsaWQgIT0gaXNWYWxpZCgpKQotICAg ICAgICBzZXROZWVkc1ZhbGlkaXR5Q2hlY2tGb3JBbGxCdXR0b25zKCk7CisgICAgICAgIHVwZGF0 ZVZhbGlkaXR5Rm9yQWxsQnV0dG9ucygpOwogICAgIGlmICghd2FzVmFsaWQpIHsKICAgICAgICAg Ly8gQSByYWRpbyBidXR0b24gbm90IGluIGEgZ3JvdXAgaXMgYWx3YXlzIHZhbGlkLiBXZSBuZWVk IHRvIG1ha2UgaXQKICAgICAgICAgLy8gdmFsaWQgb25seSBpZiB0aGUgZ3JvdXAgd2FzIGludmFs aWQuCi0gICAgICAgIGJ1dHRvbi0+c2V0TmVlZHNWYWxpZGl0eUNoZWNrKCk7CisgICAgICAgIGJ1 dHRvbi0+dXBkYXRlVmFsaWRpdHkoKTsKICAgICB9CiB9CiAKLXZvaWQgUmFkaW9CdXR0b25Hcm91 cDo6c2V0TmVlZHNWYWxpZGl0eUNoZWNrRm9yQWxsQnV0dG9ucygpCit2b2lkIFJhZGlvQnV0dG9u R3JvdXA6OnVwZGF0ZVZhbGlkaXR5Rm9yQWxsQnV0dG9ucygpCiB7CiAgICAgdHlwZWRlZiBIYXNo U2V0PEhUTUxJbnB1dEVsZW1lbnQqPjo6Y29uc3RfaXRlcmF0b3IgSXRlcmF0b3I7CiAgICAgSXRl cmF0b3IgZW5kID0gbV9tZW1iZXJzLmVuZCgpOwogICAgIGZvciAoSXRlcmF0b3IgaXQgPSBtX21l bWJlcnMuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7CiAgICAgICAgIEhUTUxJbnB1dEVsZW1l bnQqIGJ1dHRvbiA9ICppdDsKICAgICAgICAgQVNTRVJUKGJ1dHRvbi0+aXNSYWRpb0J1dHRvbigp KTsKLSAgICAgICAgYnV0dG9uLT5zZXROZWVkc1ZhbGlkaXR5Q2hlY2soKTsKKyAgICAgICAgYnV0 dG9uLT51cGRhdGVWYWxpZGl0eSgpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaHRtbC9GaWxlSW5wdXRUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvRmlsZUlu cHV0VHlwZS5jcHAKaW5kZXggZjE2OWQxOGY4NTU0NjM4MzY1MGZmMTgyZDIzMDc2M2U3Zjg2NTI4 Ni4uMDU0M2M1ZDAwYTFiOGMxMzY5MTc1M2Q4MTE1YzM2ZjA3MDM1MWI0NCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaHRtbC9GaWxlSW5wdXRUeXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL0ZpbGVJbnB1dFR5cGUuY3BwCkBAIC0zNDEsNyArMzQxLDcgQEAgdm9pZCBGaWxlSW5w dXRUeXBlOjpzZXRGaWxlcyhQYXNzUmVmUHRyPEZpbGVMaXN0PiBmaWxlcykKICAgICBtX2ZpbGVM aXN0ID0gZmlsZXM7CiAKICAgICBpbnB1dC0+c2V0Rm9ybUNvbnRyb2xWYWx1ZU1hdGNoZXNSZW5k ZXJlcih0cnVlKTsKLSAgICBpbnB1dC0+c2V0TmVlZHNWYWxpZGl0eUNoZWNrKCk7CisgICAgaW5w dXQtPnVwZGF0ZVZhbGlkaXR5KCk7CiAKICAgICBWZWN0b3I8U3RyaW5nPiBwYXRoczsKICAgICBm b3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9maWxlTGlzdC0+bGVuZ3RoKCk7ICsraSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEJ1dHRvbkVsZW1lbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MQnV0dG9uRWxlbWVudC5jcHAKaW5kZXggMjhkYjkyZjQ0N2E5Mjg0 ODcwZTg4YWI4NTBjYTE4MDIzZmViODgyMC4uZTVjNDEwNDlhMzYzNzQyODhhZjQ3Y2VlMDJjZjc1 NGQ1NTRhMjZmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQnV0dG9uRWxl bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQnV0dG9uRWxlbWVudC5jcHAK QEAgLTIwMCw5ICsyMDAsOSBAQCBjb25zdCBBdG9taWNTdHJpbmcmIEhUTUxCdXR0b25FbGVtZW50 Ojp2YWx1ZSgpIGNvbnN0CiAgICAgcmV0dXJuIGZhc3RHZXRBdHRyaWJ1dGUodmFsdWVBdHRyKTsK IH0KIAotYm9vbCBIVE1MQnV0dG9uRWxlbWVudDo6cmVjYWxjV2lsbFZhbGlkYXRlKCkgY29uc3QK K2Jvb2wgSFRNTEJ1dHRvbkVsZW1lbnQ6OmNvbXB1dGVXaWxsVmFsaWRhdGUoKSBjb25zdAogewot ICAgIHJldHVybiBtX3R5cGUgPT0gU1VCTUlUICYmIEhUTUxGb3JtQ29udHJvbEVsZW1lbnQ6OnJl Y2FsY1dpbGxWYWxpZGF0ZSgpOworICAgIHJldHVybiBtX3R5cGUgPT0gU1VCTUlUICYmIEhUTUxG b3JtQ29udHJvbEVsZW1lbnQ6OmNvbXB1dGVXaWxsVmFsaWRhdGUoKTsKIH0KIAogfSAvLyBuYW1l c3BhY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEJ1dHRvbkVsZW1lbnQu aCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEJ1dHRvbkVsZW1lbnQuaAppbmRleCBlN2U5ZTFk N2Y2MzdjZmNlMWViZDA3NDQ1M2M1NmE2NTI1NWM2YmY3Li4xZTAxZWM4NjUwZGQ2MGFmZjRiODY1 N2IyNGQ4N2YzNDQ1NDY1MGM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxC dXR0b25FbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQnV0dG9uRWxlbWVu dC5oCkBAIC02OSw3ICs2OSw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBib29sIGNhblN0YXJ0 U2VsZWN0aW9uKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gZmFsc2U7IH0KIAogICAgIHZpcnR1 YWwgYm9vbCBpc09wdGlvbmFsRm9ybUNvbnRyb2woKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiB0 cnVlOyB9Ci0gICAgdmlydHVhbCBib29sIHJlY2FsY1dpbGxWYWxpZGF0ZSgpIGNvbnN0IG92ZXJy aWRlOworICAgIHZpcnR1YWwgYm9vbCBjb21wdXRlV2lsbFZhbGlkYXRlKCkgY29uc3Qgb3ZlcnJp ZGU7CiAKICAgICBUeXBlIG1fdHlwZTsKICAgICBib29sIG1faXNBY3RpdmF0ZWRTdWJtaXQ7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGaWVsZFNldEVsZW1lbnQuaCBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZpZWxkU2V0RWxlbWVudC5oCmluZGV4IGZjYjM0NjMxYmI0 YjVkOWQyOGQ2NDM2MTRhNDJjOWI2M2Y3MzJkYTIuLjQwMTA0MGE5YmRiOGQ1ODI2MGE2ZTUyZDMy N2Q1YTFkZjVlZWJlODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZpZWxk U2V0RWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZpZWxkU2V0RWxlbWVu dC5oCkBAIC01Myw3ICs1Myw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBib29sIHN1cHBvcnRz Rm9jdXMoKSBjb25zdCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIFJlbmRlclB0cjxSZW5kZXJFbGVt ZW50PiBjcmVhdGVFbGVtZW50UmVuZGVyZXIoUGFzc1JlZjxSZW5kZXJTdHlsZT4pIG92ZXJyaWRl OwogICAgIHZpcnR1YWwgY29uc3QgQXRvbWljU3RyaW5nJiBmb3JtQ29udHJvbFR5cGUoKSBjb25z dCBvdmVycmlkZTsKLSAgICB2aXJ0dWFsIGJvb2wgcmVjYWxjV2lsbFZhbGlkYXRlKCkgY29uc3Qg b3ZlcnJpZGUgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFsIGJvb2wgY29tcHV0ZVdpbGxW YWxpZGF0ZSgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmlydHVhbCB2 b2lkIGRpc2FibGVkQXR0cmlidXRlQ2hhbmdlZCgpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9p ZCBkaXNhYmxlZFN0YXRlQ2hhbmdlZCgpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBjaGls ZHJlbkNoYW5nZWQoY29uc3QgQ2hpbGRDaGFuZ2UmKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZvcm1Db250cm9sRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxGb3JtQ29udHJvbEVsZW1lbnQuY3BwCmluZGV4IGNiY2QyMDZkZjJiNDA5 YzY5MWVkMWY0ZjE4MWY1ZDc0N2JmOWRkN2EuLjIyYzUzM2NjNTg3NTQ4OWQ2Nzk2ODAxYjg4YmFm MDE5Y2QwYjFhMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZvcm1Db250 cm9sRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRm9ybUNvbnRyb2xF bGVtZW50LmNwcApAQCAtMTY3LDcgKzE2Nyw3IEBAIHZvaWQgSFRNTEZvcm1Db250cm9sRWxlbWVu dDo6cmVhZE9ubHlBdHRyaWJ1dGVDaGFuZ2VkKCkKIAogdm9pZCBIVE1MRm9ybUNvbnRyb2xFbGVt ZW50OjpyZXF1aXJlZEF0dHJpYnV0ZUNoYW5nZWQoKQogewotICAgIHNldE5lZWRzVmFsaWRpdHlD aGVjaygpOworICAgIHVwZGF0ZVZhbGlkaXR5KCk7CiAgICAgLy8gU3R5bGUgcmVjYWxjdWxhdGlv biBpcyBuZWVkZWQgYmVjYXVzZSBzdHlsZSBzZWxlY3RvcnMgbWF5IGluY2x1ZGUKICAgICAvLyA6 cmVxdWlyZWQgYW5kIDpvcHRpb25hbCBwc2V1ZG8tY2xhc3Nlcy4KICAgICBzZXROZWVkc1N0eWxl UmVjYWxjKCk7CkBAIC0zNzMsNyArMzczLDcgQEAgc2hvcnQgSFRNTEZvcm1Db250cm9sRWxlbWVu dDo6dGFiSW5kZXgoKSBjb25zdAogICAgIHJldHVybiBFbGVtZW50Ojp0YWJJbmRleCgpOwogfQog Ci1ib29sIEhUTUxGb3JtQ29udHJvbEVsZW1lbnQ6OnJlY2FsY1dpbGxWYWxpZGF0ZSgpIGNvbnN0 Citib29sIEhUTUxGb3JtQ29udHJvbEVsZW1lbnQ6OmNvbXB1dGVXaWxsVmFsaWRhdGUoKSBjb25z dAogewogICAgIGlmIChtX2RhdGFMaXN0QW5jZXN0b3JTdGF0ZSA9PSBVbmtub3duKSB7CiAgICAg ICAgIGZvciAoQ29udGFpbmVyTm9kZSogYW5jZXN0b3IgPSBwYXJlbnROb2RlKCk7IGFuY2VzdG9y OyBhbmNlc3RvciA9IGFuY2VzdG9yLT5wYXJlbnROb2RlKCkpIHsKQEAgLTM5MiwxNCArMzkyLDE0 IEBAIGJvb2wgSFRNTEZvcm1Db250cm9sRWxlbWVudDo6d2lsbFZhbGlkYXRlKCkgY29uc3QKIHsK ICAgICBpZiAoIW1fd2lsbFZhbGlkYXRlSW5pdGlhbGl6ZWQgfHwgbV9kYXRhTGlzdEFuY2VzdG9y U3RhdGUgPT0gVW5rbm93bikgewogICAgICAgICBtX3dpbGxWYWxpZGF0ZUluaXRpYWxpemVkID0g dHJ1ZTsKLSAgICAgICAgYm9vbCBuZXdXaWxsVmFsaWRhdGUgPSByZWNhbGNXaWxsVmFsaWRhdGUo KTsKKyAgICAgICAgYm9vbCBuZXdXaWxsVmFsaWRhdGUgPSBjb21wdXRlV2lsbFZhbGlkYXRlKCk7 CiAgICAgICAgIGlmIChtX3dpbGxWYWxpZGF0ZSAhPSBuZXdXaWxsVmFsaWRhdGUpCiAgICAgICAg ICAgICBtX3dpbGxWYWxpZGF0ZSA9IG5ld1dpbGxWYWxpZGF0ZTsKICAgICB9IGVsc2UgewogICAg ICAgICAvLyBJZiB0aGUgZm9sbG93aW5nIGFzc2VydGlvbiBmYWlscywgc2V0TmVlZHNXaWxsVmFs aWRhdGVDaGVjaygpIGlzIG5vdAotICAgICAgICAvLyBjYWxsZWQgY29ycmVjdGx5IHdoZW4gc29t ZXRoaW5nIHdoaWNoIGNoYW5nZXMgcmVjYWxjV2lsbFZhbGlkYXRlKCkgcmVzdWx0CisgICAgICAg IC8vIGNhbGxlZCBjb3JyZWN0bHkgd2hlbiBzb21ldGhpbmcgd2hpY2ggY2hhbmdlcyBjb21wdXRl V2lsbFZhbGlkYXRlKCkgcmVzdWx0CiAgICAgICAgIC8vIGlzIHVwZGF0ZWQuCi0gICAgICAgIEFT U0VSVChtX3dpbGxWYWxpZGF0ZSA9PSByZWNhbGNXaWxsVmFsaWRhdGUoKSk7CisgICAgICAgIEFT U0VSVChtX3dpbGxWYWxpZGF0ZSA9PSBjb21wdXRlV2lsbFZhbGlkYXRlKCkpOwogICAgIH0KICAg ICByZXR1cm4gbV93aWxsVmFsaWRhdGU7CiB9CkBAIC00MDcsNyArNDA3LDcgQEAgYm9vbCBIVE1M Rm9ybUNvbnRyb2xFbGVtZW50Ojp3aWxsVmFsaWRhdGUoKSBjb25zdAogdm9pZCBIVE1MRm9ybUNv bnRyb2xFbGVtZW50OjpzZXROZWVkc1dpbGxWYWxpZGF0ZUNoZWNrKCkKIHsKICAgICAvLyBXZSBu ZWVkIHRvIHJlY2FsY3VsYXRlIHdpbGxWYWxpZGF0ZSBpbW1lZGlhdGVseSBiZWNhdXNlIHdpbGxW YWxpZGF0ZSBjaGFuZ2UgY2FuIGNhdXNlcyBzdHlsZSBjaGFuZ2UuCi0gICAgYm9vbCBuZXdXaWxs VmFsaWRhdGUgPSByZWNhbGNXaWxsVmFsaWRhdGUoKTsKKyAgICBib29sIG5ld1dpbGxWYWxpZGF0 ZSA9IGNvbXB1dGVXaWxsVmFsaWRhdGUoKTsKICAgICBpZiAobV93aWxsVmFsaWRhdGVJbml0aWFs aXplZCAmJiBtX3dpbGxWYWxpZGF0ZSA9PSBuZXdXaWxsVmFsaWRhdGUpCiAgICAgICAgIHJldHVy bjsKIApAQCAtNDE2LDcgKzQxNiw3IEBAIHZvaWQgSFRNTEZvcm1Db250cm9sRWxlbWVudDo6c2V0 TmVlZHNXaWxsVmFsaWRhdGVDaGVjaygpCiAgICAgbV93aWxsVmFsaWRhdGVJbml0aWFsaXplZCA9 IHRydWU7CiAgICAgbV93aWxsVmFsaWRhdGUgPSBuZXdXaWxsVmFsaWRhdGU7CiAKLSAgICBzZXRO ZWVkc1ZhbGlkaXR5Q2hlY2soKTsKKyAgICB1cGRhdGVWYWxpZGl0eSgpOwogICAgIHNldE5lZWRz U3R5bGVSZWNhbGMoKTsKIAogICAgIGlmICghbV93aWxsVmFsaWRhdGUgJiYgIXdhc1ZhbGlkKQpA QCAtNDYwLDEzICs0NjAsMTMgQEAgYm9vbCBIVE1MRm9ybUNvbnRyb2xFbGVtZW50OjpjaGVja1Zh bGlkaXR5KFZlY3RvcjxSZWZQdHI8Rm9ybUFzc29jaWF0ZWRFbGVtZW50Pj4KIAogaW5saW5lIGJv b2wgSFRNTEZvcm1Db250cm9sRWxlbWVudDo6aXNWYWxpZEZvcm1Db250cm9sRWxlbWVudCgpIGNv bnN0CiB7Ci0gICAgLy8gSWYgdGhlIGZvbGxvd2luZyBhc3NlcnRpb24gZmFpbHMsIHNldE5lZWRz VmFsaWRpdHlDaGVjaygpIGlzIG5vdCBjYWxsZWQKKyAgICAvLyBJZiB0aGUgZm9sbG93aW5nIGFz c2VydGlvbiBmYWlscywgdXBkYXRlVmFsaWRpdHkoKSBpcyBub3QgY2FsbGVkCiAgICAgLy8gY29y cmVjdGx5IHdoZW4gc29tZXRoaW5nIHdoaWNoIGNoYW5nZXMgdmFsaWRpdHkgaXMgdXBkYXRlZC4K ICAgICBBU1NFUlQobV9pc1ZhbGlkID09IHZhbGlkKCkpOwogICAgIHJldHVybiBtX2lzVmFsaWQ7 CiB9CiAKLXZvaWQgSFRNTEZvcm1Db250cm9sRWxlbWVudDo6c2V0TmVlZHNWYWxpZGl0eUNoZWNr KCkKK3ZvaWQgSFRNTEZvcm1Db250cm9sRWxlbWVudDo6dXBkYXRlVmFsaWRpdHkoKQogewogICAg IGJvb2wgd2lsbFZhbGlkYXRlID0gdGhpcy0+d2lsbFZhbGlkYXRlKCk7CiAgICAgYm9vbCB3YXNW YWxpZCA9IG1faXNWYWxpZDsKQEAgLTQ5NCw3ICs0OTQsNyBAQCB2b2lkIEhUTUxGb3JtQ29udHJv bEVsZW1lbnQ6OnNldE5lZWRzVmFsaWRpdHlDaGVjaygpCiB2b2lkIEhUTUxGb3JtQ29udHJvbEVs ZW1lbnQ6OnNldEN1c3RvbVZhbGlkaXR5KGNvbnN0IFN0cmluZyYgZXJyb3IpCiB7CiAgICAgRm9y bUFzc29jaWF0ZWRFbGVtZW50OjpzZXRDdXN0b21WYWxpZGl0eShlcnJvcik7Ci0gICAgc2V0TmVl ZHNWYWxpZGl0eUNoZWNrKCk7CisgICAgdXBkYXRlVmFsaWRpdHkoKTsKIH0KIAogYm9vbCBIVE1M Rm9ybUNvbnRyb2xFbGVtZW50Ojp2YWxpZGF0aW9uTWVzc2FnZVNoYWRvd1RyZWVDb250YWlucyhj b25zdCBOb2RlJiBub2RlKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MRm9ybUNvbnRyb2xFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGb3JtQ29u dHJvbEVsZW1lbnQuaAppbmRleCAyYmQ1ZjIzNmI2MjRlMzNmMGEwOTk5NDFkZjIyMTgyYWI0MGI5 NzczLi5lZjYwNDE1NTI3ODRlZmFlZWI3Zjc3NDQzYzNkNTk4NTcyMTIyZTE0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGb3JtQ29udHJvbEVsZW1lbnQuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxGb3JtQ29udHJvbEVsZW1lbnQuaApAQCAtMTAzLDcgKzEwMyw3 IEBAIHB1YmxpYzoKICAgICB2b2lkIGhpZGVWaXNpYmxlVmFsaWRhdGlvbk1lc3NhZ2UoKTsKICAg ICBib29sIGNoZWNrVmFsaWRpdHkoVmVjdG9yPFJlZlB0cjxGb3JtQXNzb2NpYXRlZEVsZW1lbnQ+ PiogdW5oYW5kbGVkSW52YWxpZENvbnRyb2xzID0gMCk7CiAgICAgLy8gVGhpcyBtdXN0IGJlIGNh bGxlZCB3aGVuIGEgdmFsaWRhdGlvbiBjb25zdHJhaW50IG9yIGNvbnRyb2wgdmFsdWUgaXMgY2hh bmdlZC4KLSAgICB2b2lkIHNldE5lZWRzVmFsaWRpdHlDaGVjaygpOworICAgIHZvaWQgdXBkYXRl VmFsaWRpdHkoKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0Q3VzdG9tVmFsaWRpdHkoY29uc3QgU3Ry aW5nJikgb3ZlcnJpZGU7CiAKICAgICBib29sIGlzUmVhZE9ubHkoKSBjb25zdCB7IHJldHVybiBt X2lzUmVhZE9ubHk7IH0KQEAgLTE0Miw3ICsxNDIsNyBAQCBwcm90ZWN0ZWQ6CiAKICAgICAvLyBU aGlzIG11c3QgYmUgY2FsbGVkIGFueSB0aW1lIHRoZSByZXN1bHQgb2Ygd2lsbFZhbGlkYXRlKCkg aGFzIGNoYW5nZWQuCiAgICAgdm9pZCBzZXROZWVkc1dpbGxWYWxpZGF0ZUNoZWNrKCk7Ci0gICAg dmlydHVhbCBib29sIHJlY2FsY1dpbGxWYWxpZGF0ZSgpIGNvbnN0OworICAgIHZpcnR1YWwgYm9v bCBjb21wdXRlV2lsbFZhbGlkYXRlKCkgY29uc3Q7CiAKICAgICBib29sIHZhbGlkYXRpb25NZXNz YWdlU2hhZG93VHJlZUNvbnRhaW5zKGNvbnN0IE5vZGUmKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTElucHV0RWxlbWVudC5jcHAKaW5kZXggZDA1Mjg2MTNkOTQ0OWFhYmMzNmUwMjEw YjBmMTQ2OGZjNzBiZGMzYS4uNTNkODY3OTUwMDJjNzI2ZWY3YTNhODAzMTM0MGE2NzRmMGQxMTNk ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwCkBAIC01MjcsNyAr NTI3LDcgQEAgaW5saW5lIHZvaWQgSFRNTElucHV0RWxlbWVudDo6cnVuUG9zdFR5cGVVcGRhdGVU YXNrcygpCiAKICAgICBhZGRUb1JhZGlvQnV0dG9uR3JvdXAoKTsKIAotICAgIHNldE5lZWRzVmFs aWRpdHlDaGVjaygpOworICAgIHVwZGF0ZVZhbGlkaXR5KCk7CiB9CiAKIHZvaWQgSFRNTElucHV0 RWxlbWVudDo6c3VidHJlZUhhc0NoYW5nZWQoKQpAQCAtNjY1LDcgKzY2NSw3IEBAIHZvaWQgSFRN TElucHV0RWxlbWVudDo6cGFyc2VBdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSwg Y29uc3QgQXRvbWljU3RyCiAgICAgICAgICAgICBzZXROZWVkc1N0eWxlUmVjYWxjKCk7CiAgICAg ICAgIH0KICAgICAgICAgc2V0Rm9ybUNvbnRyb2xWYWx1ZU1hdGNoZXNSZW5kZXJlcihmYWxzZSk7 Ci0gICAgICAgIHNldE5lZWRzVmFsaWRpdHlDaGVjaygpOworICAgICAgICB1cGRhdGVWYWxpZGl0 eSgpOwogICAgICAgICBtX3ZhbHVlQXR0cmlidXRlV2FzVXBkYXRlZEFmdGVyUGFyc2luZyA9ICFt X3BhcnNpbmdJblByb2dyZXNzOwogICAgIH0gZWxzZSBpZiAobmFtZSA9PSBjaGVja2VkQXR0cikg ewogICAgICAgICAvLyBBbm90aGVyIHJhZGlvIGJ1dHRvbiBpbiB0aGUgc2FtZSBncm91cCBtaWdo dCBiZSBjaGVja2VkIGJ5IHN0YXRlCkBAIC03MDIsMjAgKzcwMiwyMCBAQCB2b2lkIEhUTUxJbnB1 dEVsZW1lbnQ6OnBhcnNlQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUsIGNvbnN0 IEF0b21pY1N0cgogICAgICAgICBzZXROZWVkc1N0eWxlUmVjYWxjKCk7CiAgICAgfSBlbHNlIGlm IChuYW1lID09IG1pbkF0dHIpIHsKICAgICAgICAgbV9pbnB1dFR5cGUtPm1pbk9yTWF4QXR0cmli dXRlQ2hhbmdlZCgpOwotICAgICAgICBzZXROZWVkc1ZhbGlkaXR5Q2hlY2soKTsKKyAgICAgICAg dXBkYXRlVmFsaWRpdHkoKTsKICAgICB9IGVsc2UgaWYgKG5hbWUgPT0gbWF4QXR0cikgewogICAg ICAgICBtX2lucHV0VHlwZS0+bWluT3JNYXhBdHRyaWJ1dGVDaGFuZ2VkKCk7Ci0gICAgICAgIHNl dE5lZWRzVmFsaWRpdHlDaGVjaygpOworICAgICAgICB1cGRhdGVWYWxpZGl0eSgpOwogICAgIH0g ZWxzZSBpZiAobmFtZSA9PSBtdWx0aXBsZUF0dHIpIHsKICAgICAgICAgbV9pbnB1dFR5cGUtPm11 bHRpcGxlQXR0cmlidXRlQ2hhbmdlZCgpOwotICAgICAgICBzZXROZWVkc1ZhbGlkaXR5Q2hlY2so KTsKKyAgICAgICAgdXBkYXRlVmFsaWRpdHkoKTsKICAgICB9IGVsc2UgaWYgKG5hbWUgPT0gc3Rl cEF0dHIpIHsKICAgICAgICAgbV9pbnB1dFR5cGUtPnN0ZXBBdHRyaWJ1dGVDaGFuZ2VkKCk7Ci0g ICAgICAgIHNldE5lZWRzVmFsaWRpdHlDaGVjaygpOworICAgICAgICB1cGRhdGVWYWxpZGl0eSgp OwogICAgIH0gZWxzZSBpZiAobmFtZSA9PSBwYXR0ZXJuQXR0cikgewotICAgICAgICBzZXROZWVk c1ZhbGlkaXR5Q2hlY2soKTsKKyAgICAgICAgdXBkYXRlVmFsaWRpdHkoKTsKICAgICB9IGVsc2Ug aWYgKG5hbWUgPT0gcHJlY2lzaW9uQXR0cikgewotICAgICAgICBzZXROZWVkc1ZhbGlkaXR5Q2hl Y2soKTsKKyAgICAgICAgdXBkYXRlVmFsaWRpdHkoKTsKICAgICB9IGVsc2UgaWYgKG5hbWUgPT0g ZGlzYWJsZWRBdHRyKSB7CiAgICAgICAgIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50OjpwYXJz ZUF0dHJpYnV0ZShuYW1lLCB2YWx1ZSk7CiAgICAgICAgIG1faW5wdXRUeXBlLT5kaXNhYmxlZEF0 dHJpYnV0ZUNoYW5nZWQoKTsKQEAgLTg1OSw3ICs4NTksNyBAQCB2b2lkIEhUTUxJbnB1dEVsZW1l bnQ6OnNldENoZWNrZWQoYm9vbCBub3dDaGVja2VkLCBUZXh0RmllbGRFdmVudEJlaGF2aW9yIGV2 ZW50QgogICAgICAgICAgICAgYnV0dG9ucy0+dXBkYXRlQ2hlY2tlZFN0YXRlKHRoaXMpOwogICAg IGlmIChyZW5kZXJlcigpICYmIHJlbmRlcmVyKCktPnN0eWxlKCkuaGFzQXBwZWFyYW5jZSgpKQog ICAgICAgICByZW5kZXJlcigpLT50aGVtZSgpLnN0YXRlQ2hhbmdlZCgqcmVuZGVyZXIoKSwgQ29u dHJvbFN0YXRlczo6Q2hlY2tlZFN0YXRlKTsKLSAgICBzZXROZWVkc1ZhbGlkaXR5Q2hlY2soKTsK KyAgICB1cGRhdGVWYWxpZGl0eSgpOwogCiAgICAgLy8gSWRlYWxseSB3ZSdkIGRvIHRoaXMgZnJv bSB0aGUgcmVuZGVyIHRyZWUgKG1hdGNoaW5nCiAgICAgLy8gUmVuZGVyVGV4dFZpZXcpLCBidXQg aXQncyBub3QgcG9zc2libGUgdG8gZG8gaXQgYXQgdGhlIG1vbWVudApAQCAtMTAwMyw3ICsxMDAz LDcgQEAgdm9pZCBIVE1MSW5wdXRFbGVtZW50OjpzZXRWYWx1ZUludGVybmFsKGNvbnN0IFN0cmlu ZyYgc2FuaXRpemVkVmFsdWUsIFRleHRGaWVsZEUKIHsKICAgICBtX3ZhbHVlSWZEaXJ0eSA9IHNh bml0aXplZFZhbHVlOwogICAgIG1fd2FzTW9kaWZpZWRCeVVzZXIgPSBldmVudEJlaGF2aW9yICE9 IERpc3BhdGNoTm9FdmVudDsKLSAgICBzZXROZWVkc1ZhbGlkaXR5Q2hlY2soKTsKKyAgICB1cGRh dGVWYWxpZGl0eSgpOwogfQogCiBkb3VibGUgSFRNTElucHV0RWxlbWVudDo6dmFsdWVBc0RhdGUo KSBjb25zdApAQCAtMTA1MCw3ICsxMDUwLDcgQEAgdm9pZCBIVE1MSW5wdXRFbGVtZW50OjpzZXRW YWx1ZUZyb21SZW5kZXJlcihjb25zdCBTdHJpbmcmIHZhbHVlKQogICAgIGlmICghaXNUZXh0Rmll bGQoKSkKICAgICAgICAgZGlzcGF0Y2hJbnB1dEV2ZW50KCk7CiAKLSAgICBzZXROZWVkc1ZhbGlk aXR5Q2hlY2soKTsKKyAgICB1cGRhdGVWYWxpZGl0eSgpOwogCiAgICAgLy8gQ2xlYXIgYXV0b2Zp bGwgZmxhZyAoYW5kIHllbGxvdyBiYWNrZ3JvdW5kKSBvbiB1c2VyIGVkaXQuCiAgICAgc2V0QXV0 b2ZpbGxlZChmYWxzZSk7CkBAIC0xNTA5LDkgKzE1MDksOSBAQCB2b2lkIEhUTUxJbnB1dEVsZW1l bnQ6OmFkZFN1YnJlc291cmNlQXR0cmlidXRlVVJMcyhMaXN0SGFzaFNldDxVUkw+JiB1cmxzKSBj b25zdAogICAgIGFkZFN1YnJlc291cmNlVVJMKHVybHMsIHNyYygpKTsKIH0KIAotYm9vbCBIVE1M SW5wdXRFbGVtZW50OjpyZWNhbGNXaWxsVmFsaWRhdGUoKSBjb25zdAorYm9vbCBIVE1MSW5wdXRF bGVtZW50Ojpjb21wdXRlV2lsbFZhbGlkYXRlKCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9pbnB1 dFR5cGUtPnN1cHBvcnRzVmFsaWRhdGlvbigpICYmIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50 OjpyZWNhbGNXaWxsVmFsaWRhdGUoKTsKKyAgICByZXR1cm4gbV9pbnB1dFR5cGUtPnN1cHBvcnRz VmFsaWRhdGlvbigpICYmIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50Ojpjb21wdXRlV2lsbFZh bGlkYXRlKCk7CiB9CiAKIHZvaWQgSFRNTElucHV0RWxlbWVudDo6cmVxdWlyZWRBdHRyaWJ1dGVD aGFuZ2VkKCkKQEAgLTE3MzIsNyArMTczMiw3IEBAIHZvaWQgSFRNTElucHV0RWxlbWVudDo6cGFy c2VNYXhMZW5ndGhBdHRyaWJ1dGUoY29uc3QgQXRvbWljU3RyaW5nJiB2YWx1ZSkKICAgICBpZiAo b2xkTWF4TGVuZ3RoICE9IG1heExlbmd0aCkKICAgICAgICAgdXBkYXRlVmFsdWVJZk5lZWRlZCgp OwogICAgIHNldE5lZWRzU3R5bGVSZWNhbGMoKTsKLSAgICBzZXROZWVkc1ZhbGlkaXR5Q2hlY2so KTsKKyAgICB1cGRhdGVWYWxpZGl0eSgpOwogfQogCiB2b2lkIEhUTUxJbnB1dEVsZW1lbnQ6OnVw ZGF0ZVZhbHVlSWZOZWVkZWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M SW5wdXRFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuaApp bmRleCAwMjgyNDc5ZmQwNmUwZDI1NmJhZGQ2ZjBhOGFhZTlmNTg5ODJiN2ZlLi5lYzBmMzY1ZTZi ZWEyYjNiYzI0NzA4ZGRhMWYyMDgxNmEyYTAxNDA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJ bnB1dEVsZW1lbnQuaApAQCAtMzk2LDcgKzM5Niw3IEBAIHByaXZhdGU6CiAKICAgICB2aXJ0dWFs IGJvb2wgaXNPcHRpb25hbEZvcm1Db250cm9sKCkgY29uc3Qgb3ZlcnJpZGUgZmluYWwgeyByZXR1 cm4gIWlzUmVxdWlyZWRGb3JtQ29udHJvbCgpOyB9CiAgICAgdmlydHVhbCBib29sIGlzUmVxdWly ZWRGb3JtQ29udHJvbCgpIGNvbnN0IG92ZXJyaWRlIGZpbmFsOwotICAgIHZpcnR1YWwgYm9vbCBy ZWNhbGNXaWxsVmFsaWRhdGUoKSBjb25zdCBvdmVycmlkZSBmaW5hbDsKKyAgICB2aXJ0dWFsIGJv b2wgY29tcHV0ZVdpbGxWYWxpZGF0ZSgpIGNvbnN0IG92ZXJyaWRlIGZpbmFsOwogICAgIHZpcnR1 YWwgdm9pZCByZXF1aXJlZEF0dHJpYnV0ZUNoYW5nZWQoKSBvdmVycmlkZSBmaW5hbDsKIAogICAg IHZvaWQgaW5pdGlhbGl6ZUlucHV0VHlwZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MS2V5Z2VuRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MS2V5Z2Vu RWxlbWVudC5oCmluZGV4IGRmNzRlYTIwMDIyMjJmYmJiNjlmNTI5MGFkZGY5MjY1OTg3NDA5Mjku LjFkMjA4ZjhmMmM3MjZhMzA2NzMzYWQ4NzBjYTY5YTQyODM2ZWY3N2EgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTEtleWdlbkVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxLZXlnZW5FbGVtZW50LmgKQEAgLTM3LDcgKzM3LDcgQEAgcHVibGljOgogcHJp dmF0ZToKICAgICBIVE1MS2V5Z2VuRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiwgRG9jdW1l bnQmLCBIVE1MRm9ybUVsZW1lbnQqKTsKIAotICAgIHZpcnR1YWwgYm9vbCByZWNhbGNXaWxsVmFs aWRhdGUoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1YWwgYm9v bCBjb21wdXRlV2lsbFZhbGlkYXRlKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gZmFsc2U7IH0K ICAgICB2aXJ0dWFsIGJvb2wgY2FuU3RhcnRTZWxlY3Rpb24oKSBjb25zdCBvdmVycmlkZSB7IHJl dHVybiBmYWxzZTsgfQogCiAgICAgdmlydHVhbCB2b2lkIHBhcnNlQXR0cmlidXRlKGNvbnN0IFF1 YWxpZmllZE5hbWUmLCBjb25zdCBBdG9taWNTdHJpbmcmKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE91dHB1dEVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTE91dHB1dEVsZW1lbnQuaAppbmRleCBlODRkMDA4MTA3YWI3NmEyZDM4ZjI5ODc3 MTBiOGY5NTk4ZDdmZmY5Li44M2E5YjY0ZmNmZDNiODZmZDBlMDUyZThmNjAwZmNiYzBjMzA5YWU5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPdXRwdXRFbGVtZW50LmgKKysr IGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MT3V0cHV0RWxlbWVudC5oCkBAIC01Miw3ICs1Miw3 IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgSFRNTE91dHB1dEVsZW1lbnQoY29uc3QgUXVhbGlm aWVkTmFtZSYsIERvY3VtZW50JiwgSFRNTEZvcm1FbGVtZW50Kik7CiAKLSAgICB2aXJ0dWFsIGJv b2wgcmVjYWxjV2lsbFZhbGlkYXRlKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gZmFsc2U7IH0K KyAgICB2aXJ0dWFsIGJvb2wgY29tcHV0ZVdpbGxWYWxpZGF0ZSgpIGNvbnN0IG92ZXJyaWRlIHsg cmV0dXJuIGZhbHNlOyB9CiAgICAgdmlydHVhbCB2b2lkIHBhcnNlQXR0cmlidXRlKGNvbnN0IFF1 YWxpZmllZE5hbWUmLCBjb25zdCBBdG9taWNTdHJpbmcmKSBvdmVycmlkZTsKICAgICB2aXJ0dWFs IGNvbnN0IEF0b21pY1N0cmluZyYgZm9ybUNvbnRyb2xUeXBlKCkgY29uc3Qgb3ZlcnJpZGU7CiAg ICAgdmlydHVhbCBib29sIGlzRW51bWVyYXRhYmxlKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4g dHJ1ZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MU2VsZWN0RWxlbWVu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTZWxlY3RFbGVtZW50LmNwcAppbmRleCA0 NzJiMzY5MTZlMjA0ODYwNmEyYWUzMmExNjRiM2FjYjAwODMwMDMxLi5jYjE1YjZkYzkxNDhkNmI4 ZTg0YTU2YzkwZWFiN2I4YzEzMWM2NDBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxTZWxlY3RFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTZWxl Y3RFbGVtZW50LmNwcApAQCAtMTA0LDcgKzEwNCw3IEBAIGNvbnN0IEF0b21pY1N0cmluZyYgSFRN TFNlbGVjdEVsZW1lbnQ6OmZvcm1Db250cm9sVHlwZSgpIGNvbnN0CiB2b2lkIEhUTUxTZWxlY3RF bGVtZW50OjpkZXNlbGVjdEl0ZW1zKEhUTUxPcHRpb25FbGVtZW50KiBleGNsdWRlRWxlbWVudCkK IHsKICAgICBkZXNlbGVjdEl0ZW1zV2l0aG91dFZhbGlkYXRpb24oZXhjbHVkZUVsZW1lbnQpOwot ICAgIHNldE5lZWRzVmFsaWRpdHlDaGVjaygpOworICAgIHVwZGF0ZVZhbGlkaXR5KCk7CiB9CiAK IHZvaWQgSFRNTFNlbGVjdEVsZW1lbnQ6Om9wdGlvblNlbGVjdGVkQnlVc2VyKGludCBvcHRpb25J bmRleCwgYm9vbCBmaXJlT25DaGFuZ2VOb3csIGJvb2wgYWxsb3dNdWx0aXBsZVNlbGVjdGlvbikK QEAgLTExMyw3ICsxMTMsNyBAQCB2b2lkIEhUTUxTZWxlY3RFbGVtZW50OjpvcHRpb25TZWxlY3Rl ZEJ5VXNlcihpbnQgb3B0aW9uSW5kZXgsIGJvb2wgZmlyZU9uQ2hhbmdlTgogICAgIC8vIFRoaXMg cHJvZHVjZXMgdGhhdCBzYW1lIGJlaGF2aW9yIGZvciBjaGFuZ2VzIHRyaWdnZXJlZCBieSBvdGhl ciBjb2RlIHJ1bm5pbmcgb24gYmVoYWxmIG9mIHRoZSB1c2VyLgogICAgIGlmICghdXNlc01lbnVM aXN0KCkpIHsKICAgICAgICAgdXBkYXRlU2VsZWN0ZWRTdGF0ZShvcHRpb25Ub0xpc3RJbmRleChv cHRpb25JbmRleCksIGFsbG93TXVsdGlwbGVTZWxlY3Rpb24sIGZhbHNlKTsKLSAgICAgICAgc2V0 TmVlZHNWYWxpZGl0eUNoZWNrKCk7CisgICAgICAgIHVwZGF0ZVZhbGlkaXR5KCk7CiAgICAgICAg IGlmIChmaXJlT25DaGFuZ2VOb3cpCiAgICAgICAgICAgICBsaXN0Qm94T25DaGFuZ2UoKTsKICAg ICAgICAgcmV0dXJuOwpAQCAtMTg0LDcgKzE4NCw3IEBAIHZvaWQgSFRNTFNlbGVjdEVsZW1lbnQ6 Omxpc3RCb3hTZWxlY3RJdGVtKGludCBsaXN0SW5kZXgsIGJvb2wgYWxsb3dNdWx0aXBseVNlbGVj CiAgICAgICAgIG9wdGlvblNlbGVjdGVkQnlVc2VyKGxpc3RUb09wdGlvbkluZGV4KGxpc3RJbmRl eCksIGZpcmVPbkNoYW5nZU5vdywgZmFsc2UpOwogICAgIGVsc2UgewogICAgICAgICB1cGRhdGVT ZWxlY3RlZFN0YXRlKGxpc3RJbmRleCwgYWxsb3dNdWx0aXBseVNlbGVjdGlvbnMsIHNoaWZ0KTsK LSAgICAgICAgc2V0TmVlZHNWYWxpZGl0eUNoZWNrKCk7CisgICAgICAgIHVwZGF0ZVZhbGlkaXR5 KCk7CiAgICAgICAgIGlmIChmaXJlT25DaGFuZ2VOb3cpCiAgICAgICAgICAgICBsaXN0Qm94T25D aGFuZ2UoKTsKICAgICB9CkBAIC0yMjcsNyArMjI3LDcgQEAgdm9pZCBIVE1MU2VsZWN0RWxlbWVu dDo6YWRkKEhUTUxFbGVtZW50KiBlbGVtZW50LCBIVE1MRWxlbWVudCogYmVmb3JlLCBFeGNlcHRp b24KICAgICBSZWY8SFRNTEVsZW1lbnQ+IHByb3RlY3ROZXdDaGlsZCgqZWxlbWVudCk7CiAKICAg ICBpbnNlcnRCZWZvcmUoZWxlbWVudCwgYmVmb3JlLCBlYyk7Ci0gICAgc2V0TmVlZHNWYWxpZGl0 eUNoZWNrKCk7CisgICAgdXBkYXRlVmFsaWRpdHkoKTsKIH0KIAogdm9pZCBIVE1MU2VsZWN0RWxl bWVudDo6cmVtb3ZlQnlJbmRleChpbnQgb3B0aW9uSW5kZXgpCkBAIC0zMTMsNyArMzEzLDcgQEAg dm9pZCBIVE1MU2VsZWN0RWxlbWVudDo6cGFyc2VBdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFt ZSYgbmFtZSwgY29uc3QgQXRvbWljU3QKICAgICAgICAgICAgIHVwZGF0ZUxpc3RJdGVtU2VsZWN0 ZWRTdGF0ZXMoKTsKIAogICAgICAgICBtX3NpemUgPSBzaXplOwotICAgICAgICBzZXROZWVkc1Zh bGlkaXR5Q2hlY2soKTsKKyAgICAgICAgdXBkYXRlVmFsaWRpdHkoKTsKICAgICAgICAgaWYgKG1f c2l6ZSAhPSBvbGRTaXplKSB7CiAgICAgICAgICAgICBzZXROZWVkc1N0eWxlUmVjYWxjKFJlY29u c3RydWN0UmVuZGVyVHJlZSk7CiAgICAgICAgICAgICBzZXRSZWNhbGNMaXN0SXRlbXMoKTsKQEAg LTM4Nyw3ICszODcsNyBAQCB2b2lkIEhUTUxTZWxlY3RFbGVtZW50Ojp1cGRhdGVMaXN0SXRlbVNl bGVjdGVkU3RhdGVzKCkKIHZvaWQgSFRNTFNlbGVjdEVsZW1lbnQ6OmNoaWxkcmVuQ2hhbmdlZChj b25zdCBDaGlsZENoYW5nZSYgY2hhbmdlKQogewogICAgIHNldFJlY2FsY0xpc3RJdGVtcygpOwot ICAgIHNldE5lZWRzVmFsaWRpdHlDaGVjaygpOworICAgIHVwZGF0ZVZhbGlkaXR5KCk7CiAgICAg bV9sYXN0T25DaGFuZ2VTZWxlY3Rpb24uY2xlYXIoKTsKIAogICAgIEhUTUxGb3JtQ29udHJvbEVs ZW1lbnRXaXRoU3RhdGU6OmNoaWxkcmVuQ2hhbmdlZChjaGFuZ2UpOwpAQCAtMzk2LDcgKzM5Niw3 IEBAIHZvaWQgSFRNTFNlbGVjdEVsZW1lbnQ6OmNoaWxkcmVuQ2hhbmdlZChjb25zdCBDaGlsZENo YW5nZSYgY2hhbmdlKQogdm9pZCBIVE1MU2VsZWN0RWxlbWVudDo6b3B0aW9uRWxlbWVudENoaWxk cmVuQ2hhbmdlZCgpCiB7CiAgICAgc2V0UmVjYWxjTGlzdEl0ZW1zKCk7Ci0gICAgc2V0TmVlZHNW YWxpZGl0eUNoZWNrKCk7CisgICAgdXBkYXRlVmFsaWRpdHkoKTsKIAogICAgIGlmIChyZW5kZXJl cigpKSB7CiAgICAgICAgIGlmIChBWE9iamVjdENhY2hlKiBjYWNoZSA9IHJlbmRlcmVyKCktPmRv Y3VtZW50KCkuZXhpc3RpbmdBWE9iamVjdENhY2hlKCkpCkBAIC00OTQsNyArNDk0LDcgQEAgdm9p ZCBIVE1MU2VsZWN0RWxlbWVudDo6c2V0TGVuZ3RoKHVuc2lnbmVkIG5ld0xlbiwgRXhjZXB0aW9u Q29kZSYgZWMpCiAgICAgICAgICAgICAgICAgaXRlbS0+cGFyZW50Tm9kZSgpLT5yZW1vdmVDaGls ZChpdGVtLmdldCgpLCBlYyk7CiAgICAgICAgIH0KICAgICB9Ci0gICAgc2V0TmVlZHNWYWxpZGl0 eUNoZWNrKCk7CisgICAgdXBkYXRlVmFsaWRpdHkoKTsKIH0KIAogYm9vbCBIVE1MU2VsZWN0RWxl bWVudDo6aXNSZXF1aXJlZEZvcm1Db250cm9sKCkgY29uc3QKQEAgLTU5MSw3ICs1OTEsNyBAQCB2 b2lkIEhUTUxTZWxlY3RFbGVtZW50OjpzZWxlY3RBbGwoKQogCiAgICAgdXBkYXRlTGlzdEJveFNl bGVjdGlvbihmYWxzZSk7CiAgICAgbGlzdEJveE9uQ2hhbmdlKCk7Ci0gICAgc2V0TmVlZHNWYWxp ZGl0eUNoZWNrKCk7CisgICAgdXBkYXRlVmFsaWRpdHkoKTsKIH0KIAogdm9pZCBIVE1MU2VsZWN0 RWxlbWVudDo6c2F2ZUxhc3RTZWxlY3Rpb24oKQpAQCAtNjU2LDcgKzY1Niw3IEBAIHZvaWQgSFRN TFNlbGVjdEVsZW1lbnQ6OnVwZGF0ZUxpc3RCb3hTZWxlY3Rpb24oYm9vbCBkZXNlbGVjdE90aGVy T3B0aW9ucykKICAgICB9CiAKICAgICBzY3JvbGxUb1NlbGVjdGlvbigpOwotICAgIHNldE5lZWRz VmFsaWRpdHlDaGVjaygpOworICAgIHVwZGF0ZVZhbGlkaXR5KCk7CiB9CiAKIHZvaWQgSFRNTFNl bGVjdEVsZW1lbnQ6Omxpc3RCb3hPbkNoYW5nZSgpCkBAIC05MDcsNyArOTA3LDcgQEAgdm9pZCBI VE1MU2VsZWN0RWxlbWVudDo6c2VsZWN0T3B0aW9uKGludCBvcHRpb25JbmRleCwgU2VsZWN0T3B0 aW9uRmxhZ3MgZmxhZ3MpCiAgICAgICAgIH0KICAgICB9CiAKLSAgICBzZXROZWVkc1ZhbGlkaXR5 Q2hlY2soKTsKKyAgICB1cGRhdGVWYWxpZGl0eSgpOwogfQogCiBpbnQgSFRNTFNlbGVjdEVsZW1l bnQ6Om9wdGlvblRvTGlzdEluZGV4KGludCBvcHRpb25JbmRleCkgY29uc3QKQEAgLTEwMzksMTQg KzEwMzksMTQgQEAgdm9pZCBIVE1MU2VsZWN0RWxlbWVudDo6cmVzdG9yZUZvcm1Db250cm9sU3Rh dGUoY29uc3QgRm9ybUNvbnRyb2xTdGF0ZSYgc3RhdGUpCiAgICAgfQogCiAgICAgc2V0T3B0aW9u c0NoYW5nZWRPblJlbmRlcmVyKCk7Ci0gICAgc2V0TmVlZHNWYWxpZGl0eUNoZWNrKCk7CisgICAg dXBkYXRlVmFsaWRpdHkoKTsKIH0KIAogdm9pZCBIVE1MU2VsZWN0RWxlbWVudDo6cGFyc2VNdWx0 aXBsZUF0dHJpYnV0ZShjb25zdCBBdG9taWNTdHJpbmcmIHZhbHVlKQogewogICAgIGJvb2wgb2xk VXNlc01lbnVMaXN0ID0gdXNlc01lbnVMaXN0KCk7CiAgICAgbV9tdWx0aXBsZSA9ICF2YWx1ZS5p c051bGwoKTsKLSAgICBzZXROZWVkc1ZhbGlkaXR5Q2hlY2soKTsKKyAgICB1cGRhdGVWYWxpZGl0 eSgpOwogICAgIGlmIChvbGRVc2VzTWVudUxpc3QgIT0gdXNlc01lbnVMaXN0KCkpCiAgICAgICAg IHNldE5lZWRzU3R5bGVSZWNhbGMoUmVjb25zdHJ1Y3RSZW5kZXJUcmVlKTsKIH0KQEAgLTExMDMs NyArMTEwMyw3IEBAIHZvaWQgSFRNTFNlbGVjdEVsZW1lbnQ6OnJlc2V0KCkKIAogICAgIHNldE9w dGlvbnNDaGFuZ2VkT25SZW5kZXJlcigpOwogICAgIHNldE5lZWRzU3R5bGVSZWNhbGMoKTsKLSAg ICBzZXROZWVkc1ZhbGlkaXR5Q2hlY2soKTsKKyAgICB1cGRhdGVWYWxpZGl0eSgpOwogfQogCiAj aWYgIVBMQVRGT1JNKFdJTikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRl eHRBcmVhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUZXh0QXJlYUVsZW1l bnQuY3BwCmluZGV4IDU4Mzc2MTBjZjVkN2QzY2U1NDUyNmUzOThmYzQ4NmRjZjI1NWUxY2IuLjNl Nzk3YjZkYmEzN2VmOWMzODRhNjljZDQ2M2FlY2JjMTAzYjY2ODYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRBcmVhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MVGV4dEFyZWFFbGVtZW50LmNwcApAQCAtMjA1LDcgKzIwNSw3IEBAIHZvaWQg SFRNTFRleHRBcmVhRWxlbWVudDo6cGFyc2VBdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYg bmFtZSwgY29uc3QgQXRvbWljCiAgICAgfSBlbHNlIGlmIChuYW1lID09IGFjY2Vzc2tleUF0dHIp IHsKICAgICAgICAgLy8gaWdub3JlIGZvciB0aGUgbW9tZW50CiAgICAgfSBlbHNlIGlmIChuYW1l ID09IG1heGxlbmd0aEF0dHIpCi0gICAgICAgIHNldE5lZWRzVmFsaWRpdHlDaGVjaygpOworICAg ICAgICB1cGRhdGVWYWxpZGl0eSgpOwogICAgIGVsc2UKICAgICAgICAgSFRNTFRleHRGb3JtQ29u dHJvbEVsZW1lbnQ6OnBhcnNlQXR0cmlidXRlKG5hbWUsIHZhbHVlKTsKIH0KQEAgLTI4MCw3ICsy ODAsNyBAQCB2b2lkIEhUTUxUZXh0QXJlYUVsZW1lbnQ6OnN1YnRyZWVIYXNDaGFuZ2VkKCkKIHsK ICAgICBzZXRDaGFuZ2VkU2luY2VMYXN0Rm9ybUNvbnRyb2xDaGFuZ2VFdmVudCh0cnVlKTsKICAg ICBzZXRGb3JtQ29udHJvbFZhbHVlTWF0Y2hlc1JlbmRlcmVyKGZhbHNlKTsKLSAgICBzZXROZWVk c1ZhbGlkaXR5Q2hlY2soKTsKKyAgICB1cGRhdGVWYWxpZGl0eSgpOwogCiAgICAgaWYgKCFmb2N1 c2VkKCkpCiAgICAgICAgIHJldHVybjsKQEAgLTM1NywxNCArMzU3LDE0IEBAIHZvaWQgSFRNTFRl eHRBcmVhRWxlbWVudDo6c2V0VmFsdWUoY29uc3QgU3RyaW5nJiB2YWx1ZSkKIHsKICAgICBzZXRW YWx1ZUNvbW1vbih2YWx1ZSk7CiAgICAgbV9pc0RpcnR5ID0gdHJ1ZTsKLSAgICBzZXROZWVkc1Zh bGlkaXR5Q2hlY2soKTsKKyAgICB1cGRhdGVWYWxpZGl0eSgpOwogfQogCiB2b2lkIEhUTUxUZXh0 QXJlYUVsZW1lbnQ6OnNldE5vbkRpcnR5VmFsdWUoY29uc3QgU3RyaW5nJiB2YWx1ZSkKIHsKICAg ICBzZXRWYWx1ZUNvbW1vbih2YWx1ZSk7CiAgICAgbV9pc0RpcnR5ID0gZmFsc2U7Ci0gICAgc2V0 TmVlZHNWYWxpZGl0eUNoZWNrKCk7CisgICAgdXBkYXRlVmFsaWRpdHkoKTsKIH0KIAogdm9pZCBI VE1MVGV4dEFyZWFFbGVtZW50OjpzZXRWYWx1ZUNvbW1vbihjb25zdCBTdHJpbmcmIG5ld1ZhbHVl KQo=