147673 2015-08-04 18:20:45 -0700 CTTE the database task code 2015-08-04 18:32:48 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1114923 0 andersca 2015-08-04 18:20:45 -0700 CTTE the database task code 1114924 1 258252 andersca 2015-08-04 18:22:30 -0700 Created attachment 258252 Patch 1114928 2 258253 andersca 2015-08-04 18:26:31 -0700 Created attachment 258253 Patch 1114929 3 258253 kling 2015-08-04 18:27:52 -0700 Comment on attachment 258253 Patch r=t.me 1114931 4 andersca 2015-08-04 18:32:48 -0700 Committed r187931: <http://trac.webkit.org/changeset/187931> 258252 2015-08-04 18:22:30 -0700 2015-08-04 18:26:27 -0700 Patch bug-147673-20150804182222.patch text/plain 10761 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3OTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODIzNDFjYWQxMTQ4NTdi MmVjN2ZiYjAxZGIwMzM4ZGVhNGM2Mzk4Yi4uNGQ2NDNlZjE1NzA4YjVjMWI0MzRlMTA0NjAwYTc4 ODM0YTNiNDQ0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACisyMDE1LTA4LTA0ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQ1RURSB0aGUgZGF0 YWJhc2UgdGFzayBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNDc2NzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIE1vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2UuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RGF0YWJhc2U6Om9wZW5BbmRWZXJpZnlWZXJzaW9uKToKKyAgICAgICAgKFdlYkNvcmU6 OkRhdGFiYXNlOjptYXJrQXNEZWxldGVkQW5kQ2xvc2UpOgorICAgICAgICAoV2ViQ29yZTo6RGF0 YWJhc2U6OnRhYmxlTmFtZXMpOgorICAgICAgICAqIE1vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJh c2VUYXNrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlVGFzazo6RGF0YWJhc2VUYXNr KToKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlVGFzazo6cGVyZm9ybVRhc2spOgorICAgICAg ICAoV2ViQ29yZTo6RGF0YWJhc2VCYWNrZW5kOjpEYXRhYmFzZU9wZW5UYXNrOjpEYXRhYmFzZU9w ZW5UYXNrKToKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlQmFja2VuZDo6RGF0YWJhc2VPcGVu VGFzazo6ZG9QZXJmb3JtVGFzayk6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZUJhY2tlbmQ6 OkRhdGFiYXNlQ2xvc2VUYXNrOjpEYXRhYmFzZUNsb3NlVGFzayk6CisgICAgICAgIChXZWJDb3Jl OjpEYXRhYmFzZUJhY2tlbmQ6OkRhdGFiYXNlQ2xvc2VUYXNrOjpkb1BlcmZvcm1UYXNrKToKKyAg ICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlQmFja2VuZDo6RGF0YWJhc2VUcmFuc2FjdGlvblRhc2s6 OkRhdGFiYXNlVHJhbnNhY3Rpb25UYXNrKToKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlQmFj a2VuZDo6RGF0YWJhc2VUYWJsZU5hbWVzVGFzazo6RGF0YWJhc2VUYWJsZU5hbWVzVGFzayk6Cisg ICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZUJhY2tlbmQ6OkRhdGFiYXNlVGFibGVOYW1lc1Rhc2s6 OmRvUGVyZm9ybVRhc2spOgorICAgICAgICAqIE1vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VU YXNrLmg6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZVRhc2s6OmRhdGFiYXNlKToKKyAgICAg ICAgKiBNb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlVGhyZWFkLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlNhbWVEYXRhYmFzZVByZWRpY2F0ZTo6b3BlcmF0b3IoKSk6CisKIDIwMTUtMDgtMDQg IEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUg YW5vdGhlciB1bnVzZWQgZGF0YWJhc2UgZnVuY3Rpb24KICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzY3MAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2UuY3BwCmluZGV4IDMyYWJjYTFkODllZTg1ZWE3Zjhi ZWMwODlkNzlkZGU3NjFiYWZmMDAuLjMwMzMxZjNiM2JjMjg3Mzc1NjM4YWVmMTUxZjA0NDVlNjAy ZWQ3YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0 YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJh c2UuY3BwCkBAIC0xMDIsNyArMTAyLDcgQEAgYm9vbCBEYXRhYmFzZTo6b3BlbkFuZFZlcmlmeVZl cnNpb24oYm9vbCBzZXRWZXJzaW9uSW5OZXdEYXRhYmFzZSwgRGF0YWJhc2VFcnJvciYKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCiAgICAgYm9vbCBzdWNjZXNzID0gZmFsc2U7Ci0gICAgYXV0byB0 YXNrID0gc3RkOjptYWtlX3VuaXF1ZTxEYXRhYmFzZU9wZW5UYXNrPih0aGlzLCBzZXRWZXJzaW9u SW5OZXdEYXRhYmFzZSwgJnN5bmNocm9uaXplciwgZXJyb3IsIGVycm9yTWVzc2FnZSwgc3VjY2Vz cyk7CisgICAgYXV0byB0YXNrID0gc3RkOjptYWtlX3VuaXF1ZTxEYXRhYmFzZU9wZW5UYXNrPigq dGhpcywgc2V0VmVyc2lvbkluTmV3RGF0YWJhc2UsIHN5bmNocm9uaXplciwgZXJyb3IsIGVycm9y TWVzc2FnZSwgc3VjY2Vzcyk7CiAgICAgZGF0YWJhc2VDb250ZXh0KCktPmRhdGFiYXNlVGhyZWFk KCktPnNjaGVkdWxlSW1tZWRpYXRlVGFzayhXVEY6Om1vdmUodGFzaykpOwogICAgIHN5bmNocm9u aXplci53YWl0Rm9yVGFza0NvbXBsZXRpb24oKTsKIApAQCAtMjU0LDcgKzI1NCw3IEBAIHZvaWQg RGF0YWJhc2U6Om1hcmtBc0RlbGV0ZWRBbmRDbG9zZSgpCiAgICAgICAgIHJldHVybjsKICAgICB9 CiAKLSAgICBhdXRvIHRhc2sgPSBzdGQ6Om1ha2VfdW5pcXVlPERhdGFiYXNlQ2xvc2VUYXNrPih0 aGlzLCAmc3luY2hyb25pemVyKTsKKyAgICBhdXRvIHRhc2sgPSBzdGQ6Om1ha2VfdW5pcXVlPERh dGFiYXNlQ2xvc2VUYXNrPigqdGhpcywgc3luY2hyb25pemVyKTsKICAgICBkYXRhYmFzZUNvbnRl eHQoKS0+ZGF0YWJhc2VUaHJlYWQoKS0+c2NoZWR1bGVJbW1lZGlhdGVUYXNrKFdURjo6bW92ZSh0 YXNrKSk7CiAgICAgc3luY2hyb25pemVyLndhaXRGb3JUYXNrQ29tcGxldGlvbigpOwogfQpAQCAt MzQxLDcgKzM0MSw3IEBAIFZlY3RvcjxTdHJpbmc+IERhdGFiYXNlOjp0YWJsZU5hbWVzKCkKICAg ICBpZiAoIWRhdGFiYXNlQ29udGV4dCgpLT5kYXRhYmFzZVRocmVhZCgpIHx8IGRhdGFiYXNlQ29u dGV4dCgpLT5kYXRhYmFzZVRocmVhZCgpLT50ZXJtaW5hdGlvblJlcXVlc3RlZCgmc3luY2hyb25p emVyKSkKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKIAotICAgIGF1dG8gdGFzayA9IHN0ZDo6bWFr ZV91bmlxdWU8RGF0YWJhc2VUYWJsZU5hbWVzVGFzaz4odGhpcywgJnN5bmNocm9uaXplciwgcmVz dWx0KTsKKyAgICBhdXRvIHRhc2sgPSBzdGQ6Om1ha2VfdW5pcXVlPERhdGFiYXNlVGFibGVOYW1l c1Rhc2s+KCp0aGlzLCBzeW5jaHJvbml6ZXIsIHJlc3VsdCk7CiAgICAgZGF0YWJhc2VDb250ZXh0 KCktPmRhdGFiYXNlVGhyZWFkKCktPnNjaGVkdWxlSW1tZWRpYXRlVGFzayhXVEY6Om1vdmUodGFz aykpOwogICAgIHN5bmNocm9uaXplci53YWl0Rm9yVGFza0NvbXBsZXRpb24oKTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZVRhc2suY3Bw IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZVRhc2suY3BwCmlu ZGV4IDQzZjg1NzE1ZGQ2YjRhODIxZDE0MWYwNmI4YjBiMWZhNGU1YzQ2MWEuLjdkZGZjOWZhMDRm MjNhMDMyZDNjYzFjM2IwOWI5MDg0ZjljNDMwZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VUYXNrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlVGFzay5jcHAKQEAgLTU4LDcgKzU4LDcgQEAg dm9pZCBEYXRhYmFzZVRhc2tTeW5jaHJvbml6ZXI6OnRhc2tDb21wbGV0ZWQoKQogICAgIG1fc3lu Y2hyb25vdXNNdXRleC51bmxvY2soKTsKIH0KIAotRGF0YWJhc2VUYXNrOjpEYXRhYmFzZVRhc2so RGF0YWJhc2VCYWNrZW5kKiBkYXRhYmFzZSwgRGF0YWJhc2VUYXNrU3luY2hyb25pemVyKiBzeW5j aHJvbml6ZXIpCitEYXRhYmFzZVRhc2s6OkRhdGFiYXNlVGFzayhEYXRhYmFzZUJhY2tlbmQmIGRh dGFiYXNlLCBEYXRhYmFzZVRhc2tTeW5jaHJvbml6ZXIqIHN5bmNocm9uaXplcikKICAgICA6IG1f ZGF0YWJhc2UoZGF0YWJhc2UpCiAgICAgLCBtX3N5bmNocm9uaXplcihzeW5jaHJvbml6ZXIpCiAj aWYgIUxPR19ESVNBQkxFRApAQCAtODMsMTIgKzgzLDcgQEAgdm9pZCBEYXRhYmFzZVRhc2s6OnBl cmZvcm1UYXNrKCkKIAogICAgIExPRyhTdG9yYWdlQVBJLCAiUGVyZm9ybWluZyAlcyAlcFxuIiwg ZGVidWdUYXNrTmFtZSgpLCB0aGlzKTsKIAotI2lmICFQTEFURk9STShJT1MpCi0gICAgbV9kYXRh YmFzZS0+cmVzZXRBdXRob3JpemVyKCk7Ci0jZWxzZQotICAgIGlmIChtX2RhdGFiYXNlKQotICAg ICAgICBtX2RhdGFiYXNlLT5yZXNldEF1dGhvcml6ZXIoKTsKLSNlbmRpZgorICAgIG1fZGF0YWJh c2UucmVzZXRBdXRob3JpemVyKCk7CiAKICAgICBkb1BlcmZvcm1UYXNrKCk7CiAKQEAgLTEwMywy MCArOTgsMTkgQEAgdm9pZCBEYXRhYmFzZVRhc2s6OnBlcmZvcm1UYXNrKCkKIC8vICoqKiBEYXRh YmFzZU9wZW5UYXNrICoqKgogLy8gT3BlbnMgdGhlIGRhdGFiYXNlIGZpbGUgYW5kIHZlcmlmaWVz IHRoZSB2ZXJzaW9uIG1hdGNoZXMgdGhlIGV4cGVjdGVkIHZlcnNpb24uCiAKLURhdGFiYXNlQmFj a2VuZDo6RGF0YWJhc2VPcGVuVGFzazo6RGF0YWJhc2VPcGVuVGFzayhEYXRhYmFzZUJhY2tlbmQq IGRhdGFiYXNlLCBib29sIHNldFZlcnNpb25Jbk5ld0RhdGFiYXNlLCBEYXRhYmFzZVRhc2tTeW5j aHJvbml6ZXIqIHN5bmNocm9uaXplciwgRGF0YWJhc2VFcnJvciYgZXJyb3IsIFN0cmluZyYgZXJy b3JNZXNzYWdlLCBib29sJiBzdWNjZXNzKQotICAgIDogRGF0YWJhc2VUYXNrKGRhdGFiYXNlLCBz eW5jaHJvbml6ZXIpCitEYXRhYmFzZUJhY2tlbmQ6OkRhdGFiYXNlT3BlblRhc2s6OkRhdGFiYXNl T3BlblRhc2soRGF0YWJhc2VCYWNrZW5kJiBkYXRhYmFzZSwgYm9vbCBzZXRWZXJzaW9uSW5OZXdE YXRhYmFzZSwgRGF0YWJhc2VUYXNrU3luY2hyb25pemVyJiBzeW5jaHJvbml6ZXIsIERhdGFiYXNl RXJyb3ImIGVycm9yLCBTdHJpbmcmIGVycm9yTWVzc2FnZSwgYm9vbCYgc3VjY2VzcykKKyAgICA6 IERhdGFiYXNlVGFzayhkYXRhYmFzZSwgJnN5bmNocm9uaXplcikKICAgICAsIG1fc2V0VmVyc2lv bkluTmV3RGF0YWJhc2Uoc2V0VmVyc2lvbkluTmV3RGF0YWJhc2UpCiAgICAgLCBtX2Vycm9yKGVy cm9yKQogICAgICwgbV9lcnJvck1lc3NhZ2UoZXJyb3JNZXNzYWdlKQogICAgICwgbV9zdWNjZXNz KHN1Y2Nlc3MpCiB7Ci0gICAgQVNTRVJUKHN5bmNocm9uaXplcik7IC8vIEEgdGFzayB3aXRoIG91 dHB1dCBwYXJhbWV0ZXJzIGlzIHN1cHBvc2VkIHRvIGJlIHN5bmNocm9ub3VzLgogfQogCiB2b2lk IERhdGFiYXNlQmFja2VuZDo6RGF0YWJhc2VPcGVuVGFzazo6ZG9QZXJmb3JtVGFzaygpCiB7CiAg ICAgU3RyaW5nIGVycm9yTWVzc2FnZTsKLSAgICBtX3N1Y2Nlc3MgPSBkYXRhYmFzZSgpLT5wZXJm b3JtT3BlbkFuZFZlcmlmeShtX3NldFZlcnNpb25Jbk5ld0RhdGFiYXNlLCBtX2Vycm9yLCBlcnJv ck1lc3NhZ2UpOworICAgIG1fc3VjY2VzcyA9IGRhdGFiYXNlKCkucGVyZm9ybU9wZW5BbmRWZXJp ZnkobV9zZXRWZXJzaW9uSW5OZXdEYXRhYmFzZSwgbV9lcnJvciwgZXJyb3JNZXNzYWdlKTsKICAg ICBpZiAoIW1fc3VjY2VzcykKICAgICAgICAgbV9lcnJvck1lc3NhZ2UgPSBlcnJvck1lc3NhZ2Uu aXNvbGF0ZWRDb3B5KCk7CiB9CkBAIC0xMzEsMTQgKzEyNSwxNCBAQCBjb25zdCBjaGFyKiBEYXRh YmFzZUJhY2tlbmQ6OkRhdGFiYXNlT3BlblRhc2s6OmRlYnVnVGFza05hbWUoKSBjb25zdAogLy8g KioqIERhdGFiYXNlQ2xvc2VUYXNrICoqKgogLy8gQ2xvc2VzIHRoZSBkYXRhYmFzZS4KIAotRGF0 YWJhc2VCYWNrZW5kOjpEYXRhYmFzZUNsb3NlVGFzazo6RGF0YWJhc2VDbG9zZVRhc2soRGF0YWJh c2VCYWNrZW5kKiBkYXRhYmFzZSwgRGF0YWJhc2VUYXNrU3luY2hyb25pemVyKiBzeW5jaHJvbml6 ZXIpCi0gICAgOiBEYXRhYmFzZVRhc2soZGF0YWJhc2UsIHN5bmNocm9uaXplcikKK0RhdGFiYXNl QmFja2VuZDo6RGF0YWJhc2VDbG9zZVRhc2s6OkRhdGFiYXNlQ2xvc2VUYXNrKERhdGFiYXNlQmFj a2VuZCYgZGF0YWJhc2UsIERhdGFiYXNlVGFza1N5bmNocm9uaXplciYgc3luY2hyb25pemVyKQor ICAgIDogRGF0YWJhc2VUYXNrKGRhdGFiYXNlLCAmc3luY2hyb25pemVyKQogewogfQogCiB2b2lk IERhdGFiYXNlQmFja2VuZDo6RGF0YWJhc2VDbG9zZVRhc2s6OmRvUGVyZm9ybVRhc2soKQogewot ICAgIERhdGFiYXNlOjpmcm9tKGRhdGFiYXNlKCkpLT5jbG9zZSgpOworICAgIERhdGFiYXNlOjpm cm9tKCZkYXRhYmFzZSgpKS0+Y2xvc2UoKTsKIH0KIAogI2lmICFMT0dfRElTQUJMRUQKQEAgLTE1 Miw3ICsxNDYsNyBAQCBjb25zdCBjaGFyKiBEYXRhYmFzZUJhY2tlbmQ6OkRhdGFiYXNlQ2xvc2VU YXNrOjpkZWJ1Z1Rhc2tOYW1lKCkgY29uc3QKIC8vIFN0YXJ0cyBhIHRyYW5zYWN0aW9uIHRoYXQg d2lsbCByZXBvcnQgaXRzIHJlc3VsdHMgdmlhIGEgY2FsbGJhY2suCiAKIERhdGFiYXNlQmFja2Vu ZDo6RGF0YWJhc2VUcmFuc2FjdGlvblRhc2s6OkRhdGFiYXNlVHJhbnNhY3Rpb25UYXNrKFBhc3NS ZWZQdHI8U1FMVHJhbnNhY3Rpb25CYWNrZW5kPiB0cmFuc2FjdGlvbikKLSAgICA6IERhdGFiYXNl VGFzayhEYXRhYmFzZTo6ZnJvbSh0cmFuc2FjdGlvbi0+ZGF0YWJhc2UoKSksIDApCisgICAgOiBE YXRhYmFzZVRhc2soKkRhdGFiYXNlOjpmcm9tKHRyYW5zYWN0aW9uLT5kYXRhYmFzZSgpKSwgMCkK ICAgICAsIG1fdHJhbnNhY3Rpb24odHJhbnNhY3Rpb24pCiAgICAgLCBtX2RpZFBlcmZvcm1UYXNr KGZhbHNlKQogewpAQCAtMTg4LDE2ICsxODIsMTUgQEAgY29uc3QgY2hhciogRGF0YWJhc2VCYWNr ZW5kOjpEYXRhYmFzZVRyYW5zYWN0aW9uVGFzazo6ZGVidWdUYXNrTmFtZSgpIGNvbnN0CiAvLyAq KiogRGF0YWJhc2VUYWJsZU5hbWVzVGFzayAqKioKIC8vIFJldHJpZXZlcyBhIGxpc3Qgb2YgYWxs IHRhYmxlcyBpbiB0aGUgZGF0YWJhc2UgLSBmb3IgV2ViSW5zcGVjdG9yIHN1cHBvcnQuCiAKLURh dGFiYXNlQmFja2VuZDo6RGF0YWJhc2VUYWJsZU5hbWVzVGFzazo6RGF0YWJhc2VUYWJsZU5hbWVz VGFzayhEYXRhYmFzZUJhY2tlbmQqIGRhdGFiYXNlLCBEYXRhYmFzZVRhc2tTeW5jaHJvbml6ZXIq IHN5bmNocm9uaXplciwgVmVjdG9yPFN0cmluZz4mIG5hbWVzKQotICAgIDogRGF0YWJhc2VUYXNr KGRhdGFiYXNlLCBzeW5jaHJvbml6ZXIpCitEYXRhYmFzZUJhY2tlbmQ6OkRhdGFiYXNlVGFibGVO YW1lc1Rhc2s6OkRhdGFiYXNlVGFibGVOYW1lc1Rhc2soRGF0YWJhc2VCYWNrZW5kJiBkYXRhYmFz ZSwgRGF0YWJhc2VUYXNrU3luY2hyb25pemVyJiBzeW5jaHJvbml6ZXIsIFZlY3RvcjxTdHJpbmc+ JiBuYW1lcykKKyAgICA6IERhdGFiYXNlVGFzayhkYXRhYmFzZSwgJnN5bmNocm9uaXplcikKICAg ICAsIG1fdGFibGVOYW1lcyhuYW1lcykKIHsKLSAgICBBU1NFUlQoc3luY2hyb25pemVyKTsgLy8g QSB0YXNrIHdpdGggb3V0cHV0IHBhcmFtZXRlcnMgaXMgc3VwcG9zZWQgdG8gYmUgc3luY2hyb25v dXMuCiB9CiAKIHZvaWQgRGF0YWJhc2VCYWNrZW5kOjpEYXRhYmFzZVRhYmxlTmFtZXNUYXNrOjpk b1BlcmZvcm1UYXNrKCkKIHsKLSAgICBtX3RhYmxlTmFtZXMgPSBEYXRhYmFzZTo6ZnJvbShkYXRh YmFzZSgpKS0+cGVyZm9ybUdldFRhYmxlTmFtZXMoKTsKKyAgICBtX3RhYmxlTmFtZXMgPSBEYXRh YmFzZTo6ZnJvbSgmZGF0YWJhc2UoKSktPnBlcmZvcm1HZXRUYWJsZU5hbWVzKCk7CiB9CiAKICNp ZiAhTE9HX0RJU0FCTEVECmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRh dGFiYXNlL0RhdGFiYXNlVGFzay5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFz ZS9EYXRhYmFzZVRhc2suaAppbmRleCA3MDUzOTJlMzYwNmQ3ZDYzYmViOGQwNmMwZmMxNGNjOTVh YTQwMTJhLi4wMGU0NTA2NWUwZTIyM2I2MjQ2YWE3Y2I4NjFhZTFmNjAwNjM1NDFlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlVGFzay5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VUYXNrLmgKQEAg LTczLDE5ICs3MywxOSBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHBlcmZvcm1UYXNrKCk7CiAKLSAg ICBEYXRhYmFzZUJhY2tlbmQqIGRhdGFiYXNlKCkgY29uc3QgeyByZXR1cm4gbV9kYXRhYmFzZTsg fQorICAgIERhdGFiYXNlQmFja2VuZCYgZGF0YWJhc2UoKSBjb25zdCB7IHJldHVybiBtX2RhdGFi YXNlOyB9CiAjaWZuZGVmIE5ERUJVRwogICAgIGJvb2wgaGFzU3luY2hyb25pemVyKCkgY29uc3Qg eyByZXR1cm4gbV9zeW5jaHJvbml6ZXI7IH0KICAgICBib29sIGhhc0NoZWNrZWRGb3JUZXJtaW5h dGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fc3luY2hyb25pemVyLT5oYXNDaGVja2VkRm9yVGVybWlu YXRpb24oKTsgfQogI2VuZGlmCiAKIHByb3RlY3RlZDoKLSAgICBEYXRhYmFzZVRhc2soRGF0YWJh c2VCYWNrZW5kKiwgRGF0YWJhc2VUYXNrU3luY2hyb25pemVyKik7CisgICAgRGF0YWJhc2VUYXNr KERhdGFiYXNlQmFja2VuZCYsIERhdGFiYXNlVGFza1N5bmNocm9uaXplciopOwogCiBwcml2YXRl OgogICAgIHZpcnR1YWwgdm9pZCBkb1BlcmZvcm1UYXNrKCkgPSAwOwogCi0gICAgRGF0YWJhc2VC YWNrZW5kKiBtX2RhdGFiYXNlOworICAgIERhdGFiYXNlQmFja2VuZCYgbV9kYXRhYmFzZTsKICAg ICBEYXRhYmFzZVRhc2tTeW5jaHJvbml6ZXIqIG1fc3luY2hyb25pemVyOwogCiAjaWYgIUxPR19E SVNBQkxFRApAQCAtOTYsNyArOTYsNyBAQCBwcml2YXRlOgogCiBjbGFzcyBEYXRhYmFzZUJhY2tl bmQ6OkRhdGFiYXNlT3BlblRhc2sgOiBwdWJsaWMgRGF0YWJhc2VUYXNrIHsKIHB1YmxpYzoKLSAg ICBEYXRhYmFzZU9wZW5UYXNrKERhdGFiYXNlQmFja2VuZCosIGJvb2wgc2V0VmVyc2lvbkluTmV3 RGF0YWJhc2UsIERhdGFiYXNlVGFza1N5bmNocm9uaXplciosIERhdGFiYXNlRXJyb3ImLCBTdHJp bmcmIGVycm9yTWVzc2FnZSwgYm9vbCYgc3VjY2Vzcyk7CisgICAgRGF0YWJhc2VPcGVuVGFzayhE YXRhYmFzZUJhY2tlbmQmLCBib29sIHNldFZlcnNpb25Jbk5ld0RhdGFiYXNlLCBEYXRhYmFzZVRh c2tTeW5jaHJvbml6ZXImLCBEYXRhYmFzZUVycm9yJiwgU3RyaW5nJiBlcnJvck1lc3NhZ2UsIGJv b2wmIHN1Y2Nlc3MpOwogCiBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBkb1BlcmZvcm1UYXNr KCkgb3ZlcnJpZGU7CkBAIC0xMTIsNyArMTEyLDcgQEAgcHJpdmF0ZToKIAogY2xhc3MgRGF0YWJh c2VCYWNrZW5kOjpEYXRhYmFzZUNsb3NlVGFzayA6IHB1YmxpYyBEYXRhYmFzZVRhc2sgewogcHVi bGljOgotICAgIERhdGFiYXNlQ2xvc2VUYXNrKERhdGFiYXNlQmFja2VuZCosIERhdGFiYXNlVGFz a1N5bmNocm9uaXplciopOworICAgIERhdGFiYXNlQ2xvc2VUYXNrKERhdGFiYXNlQmFja2VuZCYs IERhdGFiYXNlVGFza1N5bmNocm9uaXplciYpOwogCiBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9p ZCBkb1BlcmZvcm1UYXNrKCkgb3ZlcnJpZGU7CkBAIC0xNDAsNyArMTQwLDcgQEAgcHJpdmF0ZToK IAogY2xhc3MgRGF0YWJhc2VCYWNrZW5kOjpEYXRhYmFzZVRhYmxlTmFtZXNUYXNrIDogcHVibGlj IERhdGFiYXNlVGFzayB7CiBwdWJsaWM6Ci0gICAgRGF0YWJhc2VUYWJsZU5hbWVzVGFzayhEYXRh YmFzZUJhY2tlbmQqLCBEYXRhYmFzZVRhc2tTeW5jaHJvbml6ZXIqLCBWZWN0b3I8U3RyaW5nPiYg bmFtZXMpOworICAgIERhdGFiYXNlVGFibGVOYW1lc1Rhc2soRGF0YWJhc2VCYWNrZW5kJiwgRGF0 YWJhc2VUYXNrU3luY2hyb25pemVyJiwgVmVjdG9yPFN0cmluZz4mIG5hbWVzKTsKIAogcHJpdmF0 ZToKICAgICB2aXJ0dWFsIHZvaWQgZG9QZXJmb3JtVGFzaygpIG92ZXJyaWRlOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZVRocmVhZC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlVGhyZWFkLmNwcApp bmRleCBlNGE5YWRlOGZiN2UxYjEzM2UyM2Q1NjljNjI3OGI1ZTIwYTc0YWM3Li4yZDc2ZWY1YjFh NTY4MmU0MjgwNTM0NWQ1Mjc1N2MxNjkyOTZiMTY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlVGhyZWFkLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlVGhyZWFkLmNwcApAQCAtMTY4LDcgKzE2 OCw3IEBAIHZvaWQgRGF0YWJhc2VUaHJlYWQ6OnNjaGVkdWxlSW1tZWRpYXRlVGFzayhzdGQ6OnVu aXF1ZV9wdHI8RGF0YWJhc2VUYXNrPiB0YXNrKQogY2xhc3MgU2FtZURhdGFiYXNlUHJlZGljYXRl IHsKIHB1YmxpYzoKICAgICBTYW1lRGF0YWJhc2VQcmVkaWNhdGUoY29uc3QgRGF0YWJhc2UqIGRh dGFiYXNlKSA6IG1fZGF0YWJhc2UoZGF0YWJhc2UpIHsgfQotICAgIGJvb2wgb3BlcmF0b3IoKShj b25zdCBEYXRhYmFzZVRhc2smIHRhc2spIGNvbnN0IHsgcmV0dXJuIHRhc2suZGF0YWJhc2UoKSA9 PSBtX2RhdGFiYXNlOyB9CisgICAgYm9vbCBvcGVyYXRvcigpKGNvbnN0IERhdGFiYXNlVGFzayYg dGFzaykgY29uc3QgeyByZXR1cm4gJnRhc2suZGF0YWJhc2UoKSA9PSBtX2RhdGFiYXNlOyB9CiBw cml2YXRlOgogICAgIGNvbnN0IERhdGFiYXNlKiBtX2RhdGFiYXNlOwogfTsK 258253 2015-08-04 18:26:31 -0700 2015-08-04 18:27:52 -0700 Patch bug-147673-20150804182623.patch text/plain 10717 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3OTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTMyZGE0MGQ5NjY2MzVh ODJjYzQxZTgxNDRhYTQ4YTgzNGY2ODgyNC4uYjUzMTY0ZmVkNTIyYzRkM2Q2MjFhMGZhNWQ3OGY4 YmVjZGRiZDAxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE1LTA4LTA0ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQ1RURSB0aGUgZGF0 YWJhc2UgdGFzayBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNDc2NzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIE1vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2UuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RGF0YWJhc2U6Om9wZW5BbmRWZXJpZnlWZXJzaW9uKToKKyAgICAgICAgKFdlYkNvcmU6 OkRhdGFiYXNlOjptYXJrQXNEZWxldGVkQW5kQ2xvc2UpOgorICAgICAgICAoV2ViQ29yZTo6RGF0 YWJhc2U6OnRhYmxlTmFtZXMpOgorICAgICAgICAqIE1vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJh c2VUYXNrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlVGFzazo6RGF0YWJhc2VUYXNr KToKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlVGFzazo6cGVyZm9ybVRhc2spOgorICAgICAg ICAoV2ViQ29yZTo6RGF0YWJhc2VCYWNrZW5kOjpEYXRhYmFzZU9wZW5UYXNrOjpEYXRhYmFzZU9w ZW5UYXNrKToKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlQmFja2VuZDo6RGF0YWJhc2VPcGVu VGFzazo6ZG9QZXJmb3JtVGFzayk6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZUJhY2tlbmQ6 OkRhdGFiYXNlQ2xvc2VUYXNrOjpEYXRhYmFzZUNsb3NlVGFzayk6CisgICAgICAgIChXZWJDb3Jl OjpEYXRhYmFzZUJhY2tlbmQ6OkRhdGFiYXNlQ2xvc2VUYXNrOjpkb1BlcmZvcm1UYXNrKToKKyAg ICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlQmFja2VuZDo6RGF0YWJhc2VUcmFuc2FjdGlvblRhc2s6 OkRhdGFiYXNlVHJhbnNhY3Rpb25UYXNrKToKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlQmFj a2VuZDo6RGF0YWJhc2VUYWJsZU5hbWVzVGFzazo6RGF0YWJhc2VUYWJsZU5hbWVzVGFzayk6Cisg ICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZUJhY2tlbmQ6OkRhdGFiYXNlVGFibGVOYW1lc1Rhc2s6 OmRvUGVyZm9ybVRhc2spOgorICAgICAgICAqIE1vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VU YXNrLmg6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZVRhc2s6OmRhdGFiYXNlKToKKyAgICAg ICAgKiBNb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlVGhyZWFkLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlNhbWVEYXRhYmFzZVByZWRpY2F0ZTo6b3BlcmF0b3IoKSk6CisKIDIwMTUtMDgtMDQg IEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBT b2Z0IGxpbmsgbGliR0xFU3YyIGFuZCBsaWJFR0wgb24gV2luZG93cyBhZ2FpbgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlLmNwcAppbmRleCAzMmFiY2Ex ZDg5ZWU4NWVhN2Y4YmVjMDg5ZDc5ZGRlNzYxYmFmZjAwLi4zMDMzMWYzYjNiYzI4NzM3NTYzOGFl ZjE1MWYwNDQ1ZTYwMmVkN2FmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dl YmRhdGFiYXNlL0RhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRh dGFiYXNlL0RhdGFiYXNlLmNwcApAQCAtMTAyLDcgKzEwMiw3IEBAIGJvb2wgRGF0YWJhc2U6Om9w ZW5BbmRWZXJpZnlWZXJzaW9uKGJvb2wgc2V0VmVyc2lvbkluTmV3RGF0YWJhc2UsIERhdGFiYXNl RXJyb3ImCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGJvb2wgc3VjY2VzcyA9IGZhbHNl OwotICAgIGF1dG8gdGFzayA9IHN0ZDo6bWFrZV91bmlxdWU8RGF0YWJhc2VPcGVuVGFzaz4odGhp cywgc2V0VmVyc2lvbkluTmV3RGF0YWJhc2UsICZzeW5jaHJvbml6ZXIsIGVycm9yLCBlcnJvck1l c3NhZ2UsIHN1Y2Nlc3MpOworICAgIGF1dG8gdGFzayA9IHN0ZDo6bWFrZV91bmlxdWU8RGF0YWJh c2VPcGVuVGFzaz4oKnRoaXMsIHNldFZlcnNpb25Jbk5ld0RhdGFiYXNlLCBzeW5jaHJvbml6ZXIs IGVycm9yLCBlcnJvck1lc3NhZ2UsIHN1Y2Nlc3MpOwogICAgIGRhdGFiYXNlQ29udGV4dCgpLT5k YXRhYmFzZVRocmVhZCgpLT5zY2hlZHVsZUltbWVkaWF0ZVRhc2soV1RGOjptb3ZlKHRhc2spKTsK ICAgICBzeW5jaHJvbml6ZXIud2FpdEZvclRhc2tDb21wbGV0aW9uKCk7CiAKQEAgLTI1NCw3ICsy NTQsNyBAQCB2b2lkIERhdGFiYXNlOjptYXJrQXNEZWxldGVkQW5kQ2xvc2UoKQogICAgICAgICBy ZXR1cm47CiAgICAgfQogCi0gICAgYXV0byB0YXNrID0gc3RkOjptYWtlX3VuaXF1ZTxEYXRhYmFz ZUNsb3NlVGFzaz4odGhpcywgJnN5bmNocm9uaXplcik7CisgICAgYXV0byB0YXNrID0gc3RkOjpt YWtlX3VuaXF1ZTxEYXRhYmFzZUNsb3NlVGFzaz4oKnRoaXMsIHN5bmNocm9uaXplcik7CiAgICAg ZGF0YWJhc2VDb250ZXh0KCktPmRhdGFiYXNlVGhyZWFkKCktPnNjaGVkdWxlSW1tZWRpYXRlVGFz ayhXVEY6Om1vdmUodGFzaykpOwogICAgIHN5bmNocm9uaXplci53YWl0Rm9yVGFza0NvbXBsZXRp b24oKTsKIH0KQEAgLTM0MSw3ICszNDEsNyBAQCBWZWN0b3I8U3RyaW5nPiBEYXRhYmFzZTo6dGFi bGVOYW1lcygpCiAgICAgaWYgKCFkYXRhYmFzZUNvbnRleHQoKS0+ZGF0YWJhc2VUaHJlYWQoKSB8 fCBkYXRhYmFzZUNvbnRleHQoKS0+ZGF0YWJhc2VUaHJlYWQoKS0+dGVybWluYXRpb25SZXF1ZXN0 ZWQoJnN5bmNocm9uaXplcikpCiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAKLSAgICBhdXRvIHRh c2sgPSBzdGQ6Om1ha2VfdW5pcXVlPERhdGFiYXNlVGFibGVOYW1lc1Rhc2s+KHRoaXMsICZzeW5j aHJvbml6ZXIsIHJlc3VsdCk7CisgICAgYXV0byB0YXNrID0gc3RkOjptYWtlX3VuaXF1ZTxEYXRh YmFzZVRhYmxlTmFtZXNUYXNrPigqdGhpcywgc3luY2hyb25pemVyLCByZXN1bHQpOwogICAgIGRh dGFiYXNlQ29udGV4dCgpLT5kYXRhYmFzZVRocmVhZCgpLT5zY2hlZHVsZUltbWVkaWF0ZVRhc2so V1RGOjptb3ZlKHRhc2spKTsKICAgICBzeW5jaHJvbml6ZXIud2FpdEZvclRhc2tDb21wbGV0aW9u KCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0 YWJhc2VUYXNrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJh c2VUYXNrLmNwcAppbmRleCA0M2Y4NTcxNWRkNmI0YTgyMWQxNDFmMDZiOGIwYjFmYTRlNWM0NjFh Li43ZGRmYzlmYTA0ZjIzYTAzMmQzY2MxYzNiMDliOTA4NGY5YzQzMGQwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlVGFzay5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZVRhc2suY3BwCkBAIC01 OCw3ICs1OCw3IEBAIHZvaWQgRGF0YWJhc2VUYXNrU3luY2hyb25pemVyOjp0YXNrQ29tcGxldGVk KCkKICAgICBtX3N5bmNocm9ub3VzTXV0ZXgudW5sb2NrKCk7CiB9CiAKLURhdGFiYXNlVGFzazo6 RGF0YWJhc2VUYXNrKERhdGFiYXNlQmFja2VuZCogZGF0YWJhc2UsIERhdGFiYXNlVGFza1N5bmNo cm9uaXplciogc3luY2hyb25pemVyKQorRGF0YWJhc2VUYXNrOjpEYXRhYmFzZVRhc2soRGF0YWJh c2VCYWNrZW5kJiBkYXRhYmFzZSwgRGF0YWJhc2VUYXNrU3luY2hyb25pemVyKiBzeW5jaHJvbml6 ZXIpCiAgICAgOiBtX2RhdGFiYXNlKGRhdGFiYXNlKQogICAgICwgbV9zeW5jaHJvbml6ZXIoc3lu Y2hyb25pemVyKQogI2lmICFMT0dfRElTQUJMRUQKQEAgLTgzLDEyICs4Myw3IEBAIHZvaWQgRGF0 YWJhc2VUYXNrOjpwZXJmb3JtVGFzaygpCiAKICAgICBMT0coU3RvcmFnZUFQSSwgIlBlcmZvcm1p bmcgJXMgJXBcbiIsIGRlYnVnVGFza05hbWUoKSwgdGhpcyk7CiAKLSNpZiAhUExBVEZPUk0oSU9T KQotICAgIG1fZGF0YWJhc2UtPnJlc2V0QXV0aG9yaXplcigpOwotI2Vsc2UKLSAgICBpZiAobV9k YXRhYmFzZSkKLSAgICAgICAgbV9kYXRhYmFzZS0+cmVzZXRBdXRob3JpemVyKCk7Ci0jZW5kaWYK KyAgICBtX2RhdGFiYXNlLnJlc2V0QXV0aG9yaXplcigpOwogCiAgICAgZG9QZXJmb3JtVGFzaygp OwogCkBAIC0xMDMsMjAgKzk4LDE5IEBAIHZvaWQgRGF0YWJhc2VUYXNrOjpwZXJmb3JtVGFzaygp CiAvLyAqKiogRGF0YWJhc2VPcGVuVGFzayAqKioKIC8vIE9wZW5zIHRoZSBkYXRhYmFzZSBmaWxl IGFuZCB2ZXJpZmllcyB0aGUgdmVyc2lvbiBtYXRjaGVzIHRoZSBleHBlY3RlZCB2ZXJzaW9uLgog Ci1EYXRhYmFzZUJhY2tlbmQ6OkRhdGFiYXNlT3BlblRhc2s6OkRhdGFiYXNlT3BlblRhc2soRGF0 YWJhc2VCYWNrZW5kKiBkYXRhYmFzZSwgYm9vbCBzZXRWZXJzaW9uSW5OZXdEYXRhYmFzZSwgRGF0 YWJhc2VUYXNrU3luY2hyb25pemVyKiBzeW5jaHJvbml6ZXIsIERhdGFiYXNlRXJyb3ImIGVycm9y LCBTdHJpbmcmIGVycm9yTWVzc2FnZSwgYm9vbCYgc3VjY2VzcykKLSAgICA6IERhdGFiYXNlVGFz ayhkYXRhYmFzZSwgc3luY2hyb25pemVyKQorRGF0YWJhc2VCYWNrZW5kOjpEYXRhYmFzZU9wZW5U YXNrOjpEYXRhYmFzZU9wZW5UYXNrKERhdGFiYXNlQmFja2VuZCYgZGF0YWJhc2UsIGJvb2wgc2V0 VmVyc2lvbkluTmV3RGF0YWJhc2UsIERhdGFiYXNlVGFza1N5bmNocm9uaXplciYgc3luY2hyb25p emVyLCBEYXRhYmFzZUVycm9yJiBlcnJvciwgU3RyaW5nJiBlcnJvck1lc3NhZ2UsIGJvb2wmIHN1 Y2Nlc3MpCisgICAgOiBEYXRhYmFzZVRhc2soZGF0YWJhc2UsICZzeW5jaHJvbml6ZXIpCiAgICAg LCBtX3NldFZlcnNpb25Jbk5ld0RhdGFiYXNlKHNldFZlcnNpb25Jbk5ld0RhdGFiYXNlKQogICAg ICwgbV9lcnJvcihlcnJvcikKICAgICAsIG1fZXJyb3JNZXNzYWdlKGVycm9yTWVzc2FnZSkKICAg ICAsIG1fc3VjY2VzcyhzdWNjZXNzKQogewotICAgIEFTU0VSVChzeW5jaHJvbml6ZXIpOyAvLyBB IHRhc2sgd2l0aCBvdXRwdXQgcGFyYW1ldGVycyBpcyBzdXBwb3NlZCB0byBiZSBzeW5jaHJvbm91 cy4KIH0KIAogdm9pZCBEYXRhYmFzZUJhY2tlbmQ6OkRhdGFiYXNlT3BlblRhc2s6OmRvUGVyZm9y bVRhc2soKQogewogICAgIFN0cmluZyBlcnJvck1lc3NhZ2U7Ci0gICAgbV9zdWNjZXNzID0gZGF0 YWJhc2UoKS0+cGVyZm9ybU9wZW5BbmRWZXJpZnkobV9zZXRWZXJzaW9uSW5OZXdEYXRhYmFzZSwg bV9lcnJvciwgZXJyb3JNZXNzYWdlKTsKKyAgICBtX3N1Y2Nlc3MgPSBkYXRhYmFzZSgpLnBlcmZv cm1PcGVuQW5kVmVyaWZ5KG1fc2V0VmVyc2lvbkluTmV3RGF0YWJhc2UsIG1fZXJyb3IsIGVycm9y TWVzc2FnZSk7CiAgICAgaWYgKCFtX3N1Y2Nlc3MpCiAgICAgICAgIG1fZXJyb3JNZXNzYWdlID0g ZXJyb3JNZXNzYWdlLmlzb2xhdGVkQ29weSgpOwogfQpAQCAtMTMxLDE0ICsxMjUsMTQgQEAgY29u c3QgY2hhciogRGF0YWJhc2VCYWNrZW5kOjpEYXRhYmFzZU9wZW5UYXNrOjpkZWJ1Z1Rhc2tOYW1l KCkgY29uc3QKIC8vICoqKiBEYXRhYmFzZUNsb3NlVGFzayAqKioKIC8vIENsb3NlcyB0aGUgZGF0 YWJhc2UuCiAKLURhdGFiYXNlQmFja2VuZDo6RGF0YWJhc2VDbG9zZVRhc2s6OkRhdGFiYXNlQ2xv c2VUYXNrKERhdGFiYXNlQmFja2VuZCogZGF0YWJhc2UsIERhdGFiYXNlVGFza1N5bmNocm9uaXpl ciogc3luY2hyb25pemVyKQotICAgIDogRGF0YWJhc2VUYXNrKGRhdGFiYXNlLCBzeW5jaHJvbml6 ZXIpCitEYXRhYmFzZUJhY2tlbmQ6OkRhdGFiYXNlQ2xvc2VUYXNrOjpEYXRhYmFzZUNsb3NlVGFz ayhEYXRhYmFzZUJhY2tlbmQmIGRhdGFiYXNlLCBEYXRhYmFzZVRhc2tTeW5jaHJvbml6ZXImIHN5 bmNocm9uaXplcikKKyAgICA6IERhdGFiYXNlVGFzayhkYXRhYmFzZSwgJnN5bmNocm9uaXplcikK IHsKIH0KIAogdm9pZCBEYXRhYmFzZUJhY2tlbmQ6OkRhdGFiYXNlQ2xvc2VUYXNrOjpkb1BlcmZv cm1UYXNrKCkKIHsKLSAgICBEYXRhYmFzZTo6ZnJvbShkYXRhYmFzZSgpKS0+Y2xvc2UoKTsKKyAg ICBEYXRhYmFzZTo6ZnJvbSgmZGF0YWJhc2UoKSktPmNsb3NlKCk7CiB9CiAKICNpZiAhTE9HX0RJ U0FCTEVECkBAIC0xNTIsNyArMTQ2LDcgQEAgY29uc3QgY2hhciogRGF0YWJhc2VCYWNrZW5kOjpE YXRhYmFzZUNsb3NlVGFzazo6ZGVidWdUYXNrTmFtZSgpIGNvbnN0CiAvLyBTdGFydHMgYSB0cmFu c2FjdGlvbiB0aGF0IHdpbGwgcmVwb3J0IGl0cyByZXN1bHRzIHZpYSBhIGNhbGxiYWNrLgogCiBE YXRhYmFzZUJhY2tlbmQ6OkRhdGFiYXNlVHJhbnNhY3Rpb25UYXNrOjpEYXRhYmFzZVRyYW5zYWN0 aW9uVGFzayhQYXNzUmVmUHRyPFNRTFRyYW5zYWN0aW9uQmFja2VuZD4gdHJhbnNhY3Rpb24pCi0g ICAgOiBEYXRhYmFzZVRhc2soRGF0YWJhc2U6OmZyb20odHJhbnNhY3Rpb24tPmRhdGFiYXNlKCkp LCAwKQorICAgIDogRGF0YWJhc2VUYXNrKCpEYXRhYmFzZTo6ZnJvbSh0cmFuc2FjdGlvbi0+ZGF0 YWJhc2UoKSksIDApCiAgICAgLCBtX3RyYW5zYWN0aW9uKHRyYW5zYWN0aW9uKQogICAgICwgbV9k aWRQZXJmb3JtVGFzayhmYWxzZSkKIHsKQEAgLTE4OCwxNiArMTgyLDE1IEBAIGNvbnN0IGNoYXIq IERhdGFiYXNlQmFja2VuZDo6RGF0YWJhc2VUcmFuc2FjdGlvblRhc2s6OmRlYnVnVGFza05hbWUo KSBjb25zdAogLy8gKioqIERhdGFiYXNlVGFibGVOYW1lc1Rhc2sgKioqCiAvLyBSZXRyaWV2ZXMg YSBsaXN0IG9mIGFsbCB0YWJsZXMgaW4gdGhlIGRhdGFiYXNlIC0gZm9yIFdlYkluc3BlY3RvciBz dXBwb3J0LgogCi1EYXRhYmFzZUJhY2tlbmQ6OkRhdGFiYXNlVGFibGVOYW1lc1Rhc2s6OkRhdGFi YXNlVGFibGVOYW1lc1Rhc2soRGF0YWJhc2VCYWNrZW5kKiBkYXRhYmFzZSwgRGF0YWJhc2VUYXNr U3luY2hyb25pemVyKiBzeW5jaHJvbml6ZXIsIFZlY3RvcjxTdHJpbmc+JiBuYW1lcykKLSAgICA6 IERhdGFiYXNlVGFzayhkYXRhYmFzZSwgc3luY2hyb25pemVyKQorRGF0YWJhc2VCYWNrZW5kOjpE YXRhYmFzZVRhYmxlTmFtZXNUYXNrOjpEYXRhYmFzZVRhYmxlTmFtZXNUYXNrKERhdGFiYXNlQmFj a2VuZCYgZGF0YWJhc2UsIERhdGFiYXNlVGFza1N5bmNocm9uaXplciYgc3luY2hyb25pemVyLCBW ZWN0b3I8U3RyaW5nPiYgbmFtZXMpCisgICAgOiBEYXRhYmFzZVRhc2soZGF0YWJhc2UsICZzeW5j aHJvbml6ZXIpCiAgICAgLCBtX3RhYmxlTmFtZXMobmFtZXMpCiB7Ci0gICAgQVNTRVJUKHN5bmNo cm9uaXplcik7IC8vIEEgdGFzayB3aXRoIG91dHB1dCBwYXJhbWV0ZXJzIGlzIHN1cHBvc2VkIHRv IGJlIHN5bmNocm9ub3VzLgogfQogCiB2b2lkIERhdGFiYXNlQmFja2VuZDo6RGF0YWJhc2VUYWJs ZU5hbWVzVGFzazo6ZG9QZXJmb3JtVGFzaygpCiB7Ci0gICAgbV90YWJsZU5hbWVzID0gRGF0YWJh c2U6OmZyb20oZGF0YWJhc2UoKSktPnBlcmZvcm1HZXRUYWJsZU5hbWVzKCk7CisgICAgbV90YWJs ZU5hbWVzID0gRGF0YWJhc2U6OmZyb20oJmRhdGFiYXNlKCkpLT5wZXJmb3JtR2V0VGFibGVOYW1l cygpOwogfQogCiAjaWYgIUxPR19ESVNBQkxFRApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZVRhc2suaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VUYXNrLmgKaW5kZXggNzA1MzkyZTM2MDZkN2Q2M2JlYjhk MDZjMGZjMTRjYzk1YWE0MDEyYS4uMDBlNDUwNjVlMGUyMjNiNjI0NmFhN2NiODYxYWUxZjYwMDYz NTQxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRh YmFzZVRhc2suaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFi YXNlVGFzay5oCkBAIC03MywxOSArNzMsMTkgQEAgcHVibGljOgogCiAgICAgdm9pZCBwZXJmb3Jt VGFzaygpOwogCi0gICAgRGF0YWJhc2VCYWNrZW5kKiBkYXRhYmFzZSgpIGNvbnN0IHsgcmV0dXJu IG1fZGF0YWJhc2U7IH0KKyAgICBEYXRhYmFzZUJhY2tlbmQmIGRhdGFiYXNlKCkgY29uc3QgeyBy ZXR1cm4gbV9kYXRhYmFzZTsgfQogI2lmbmRlZiBOREVCVUcKICAgICBib29sIGhhc1N5bmNocm9u aXplcigpIGNvbnN0IHsgcmV0dXJuIG1fc3luY2hyb25pemVyOyB9CiAgICAgYm9vbCBoYXNDaGVj a2VkRm9yVGVybWluYXRpb24oKSBjb25zdCB7IHJldHVybiBtX3N5bmNocm9uaXplci0+aGFzQ2hl Y2tlZEZvclRlcm1pbmF0aW9uKCk7IH0KICNlbmRpZgogCiBwcm90ZWN0ZWQ6Ci0gICAgRGF0YWJh c2VUYXNrKERhdGFiYXNlQmFja2VuZCosIERhdGFiYXNlVGFza1N5bmNocm9uaXplciopOworICAg IERhdGFiYXNlVGFzayhEYXRhYmFzZUJhY2tlbmQmLCBEYXRhYmFzZVRhc2tTeW5jaHJvbml6ZXIq KTsKIAogcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgZG9QZXJmb3JtVGFzaygpID0gMDsKIAot ICAgIERhdGFiYXNlQmFja2VuZCogbV9kYXRhYmFzZTsKKyAgICBEYXRhYmFzZUJhY2tlbmQmIG1f ZGF0YWJhc2U7CiAgICAgRGF0YWJhc2VUYXNrU3luY2hyb25pemVyKiBtX3N5bmNocm9uaXplcjsK IAogI2lmICFMT0dfRElTQUJMRUQKQEAgLTk2LDcgKzk2LDcgQEAgcHJpdmF0ZToKIAogY2xhc3Mg RGF0YWJhc2VCYWNrZW5kOjpEYXRhYmFzZU9wZW5UYXNrIDogcHVibGljIERhdGFiYXNlVGFzayB7 CiBwdWJsaWM6Ci0gICAgRGF0YWJhc2VPcGVuVGFzayhEYXRhYmFzZUJhY2tlbmQqLCBib29sIHNl dFZlcnNpb25Jbk5ld0RhdGFiYXNlLCBEYXRhYmFzZVRhc2tTeW5jaHJvbml6ZXIqLCBEYXRhYmFz ZUVycm9yJiwgU3RyaW5nJiBlcnJvck1lc3NhZ2UsIGJvb2wmIHN1Y2Nlc3MpOworICAgIERhdGFi YXNlT3BlblRhc2soRGF0YWJhc2VCYWNrZW5kJiwgYm9vbCBzZXRWZXJzaW9uSW5OZXdEYXRhYmFz ZSwgRGF0YWJhc2VUYXNrU3luY2hyb25pemVyJiwgRGF0YWJhc2VFcnJvciYsIFN0cmluZyYgZXJy b3JNZXNzYWdlLCBib29sJiBzdWNjZXNzKTsKIAogcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQg ZG9QZXJmb3JtVGFzaygpIG92ZXJyaWRlOwpAQCAtMTEyLDcgKzExMiw3IEBAIHByaXZhdGU6CiAK IGNsYXNzIERhdGFiYXNlQmFja2VuZDo6RGF0YWJhc2VDbG9zZVRhc2sgOiBwdWJsaWMgRGF0YWJh c2VUYXNrIHsKIHB1YmxpYzoKLSAgICBEYXRhYmFzZUNsb3NlVGFzayhEYXRhYmFzZUJhY2tlbmQq LCBEYXRhYmFzZVRhc2tTeW5jaHJvbml6ZXIqKTsKKyAgICBEYXRhYmFzZUNsb3NlVGFzayhEYXRh YmFzZUJhY2tlbmQmLCBEYXRhYmFzZVRhc2tTeW5jaHJvbml6ZXImKTsKIAogcHJpdmF0ZToKICAg ICB2aXJ0dWFsIHZvaWQgZG9QZXJmb3JtVGFzaygpIG92ZXJyaWRlOwpAQCAtMTQwLDcgKzE0MCw3 IEBAIHByaXZhdGU6CiAKIGNsYXNzIERhdGFiYXNlQmFja2VuZDo6RGF0YWJhc2VUYWJsZU5hbWVz VGFzayA6IHB1YmxpYyBEYXRhYmFzZVRhc2sgewogcHVibGljOgotICAgIERhdGFiYXNlVGFibGVO YW1lc1Rhc2soRGF0YWJhc2VCYWNrZW5kKiwgRGF0YWJhc2VUYXNrU3luY2hyb25pemVyKiwgVmVj dG9yPFN0cmluZz4mIG5hbWVzKTsKKyAgICBEYXRhYmFzZVRhYmxlTmFtZXNUYXNrKERhdGFiYXNl QmFja2VuZCYsIERhdGFiYXNlVGFza1N5bmNocm9uaXplciYsIFZlY3RvcjxTdHJpbmc+JiBuYW1l cyk7CiAKIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGRvUGVyZm9ybVRhc2soKSBvdmVycmlk ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJh c2VUaHJlYWQuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFz ZVRocmVhZC5jcHAKaW5kZXggZTRhOWFkZThmYjdlMWIxMzNlMjNkNTY5YzYyNzhiNWUyMGE3NGFj Ny4uMmQ3NmVmNWIxYTU2ODJlNDI4MDUzNDVkNTI3NTdjMTY5Mjk2YjE2NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZVRocmVhZC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZVRocmVhZC5jcHAK QEAgLTE2OCw3ICsxNjgsNyBAQCB2b2lkIERhdGFiYXNlVGhyZWFkOjpzY2hlZHVsZUltbWVkaWF0 ZVRhc2soc3RkOjp1bmlxdWVfcHRyPERhdGFiYXNlVGFzaz4gdGFzaykKIGNsYXNzIFNhbWVEYXRh YmFzZVByZWRpY2F0ZSB7CiBwdWJsaWM6CiAgICAgU2FtZURhdGFiYXNlUHJlZGljYXRlKGNvbnN0 IERhdGFiYXNlKiBkYXRhYmFzZSkgOiBtX2RhdGFiYXNlKGRhdGFiYXNlKSB7IH0KLSAgICBib29s IG9wZXJhdG9yKCkoY29uc3QgRGF0YWJhc2VUYXNrJiB0YXNrKSBjb25zdCB7IHJldHVybiB0YXNr LmRhdGFiYXNlKCkgPT0gbV9kYXRhYmFzZTsgfQorICAgIGJvb2wgb3BlcmF0b3IoKShjb25zdCBE YXRhYmFzZVRhc2smIHRhc2spIGNvbnN0IHsgcmV0dXJuICZ0YXNrLmRhdGFiYXNlKCkgPT0gbV9k YXRhYmFzZTsgfQogcHJpdmF0ZToKICAgICBjb25zdCBEYXRhYmFzZSogbV9kYXRhYmFzZTsKIH07 Cg==