192528 2018-12-08 12:56:13 -0800 [MediaStream] Scaled video frames should be resized in letterbox mode 2018-12-08 21:36:53 -0800 1 1 1 Unclassified WebKit WebRTC Safari 12 Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue darin webkit-bug-importer youennf oldest_to_newest 1486337 0 eric.carlson 2018-12-08 12:56:13 -0800 Scaled video frames should be resized in letterbox mode, not cropped 1486338 1 webkit-bug-importer 2018-12-08 12:56:42 -0800 <rdar://problem/46576638> 1486339 2 356886 eric.carlson 2018-12-08 13:00:22 -0800 Created attachment 356886 Patch 1486362 3 356893 eric.carlson 2018-12-08 17:01:02 -0800 Created attachment 356893 Patch 1486393 4 356893 commit-queue 2018-12-08 21:36:51 -0800 Comment on attachment 356893 Patch Clearing flags on attachment: 356893 Committed r239016: <https://trac.webkit.org/changeset/239016> 1486394 5 commit-queue 2018-12-08 21:36:53 -0800 All reviewed patches have been landed. Closing bug. 356886 2018-12-08 13:00:22 -0800 2018-12-08 17:01:01 -0800 Patch bug-192528-20181208130021.patch text/plain 12347 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5MDA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQ0MDkzMTQ1MjA3MGQ5 ZDUwNDdhZDQzNDk2NWNmYmQ3YWNiMWUyNy4uNGNiNWU3NDgzODE3MmFmYmUwYmUwMWZhMGRjM2I5 YzkxZjVlNmY3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE4LTEyLTA4ICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVh bV0gU2NhbGVkIHZpZGVvIGZyYW1lcyBzaG91bGQgYmUgcmVzaXplZCBpbiBsZXR0ZXJib3ggbW9k ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkyNTI4 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NjU3NjYzOD4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBmYXN0L21lZGlhc3RyZWFtL3Jlc2l6 ZS1sZXR0ZXJib3guaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY3YvSW1hZ2VU cmFuc2ZlclNlc3Npb25WVC5tbToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlVHJhbnNmZXJTZXNz aW9uVlQ6OkltYWdlVHJhbnNmZXJTZXNzaW9uVlQpOiBVc2UgbGV0dGVyYm94IHJlc2l6ZSBtb2Rl LCBub3QgdHJpbS4KKworICAgICAgICAqIHBsYXRmb3JtL21vY2svTW9ja1JlYWx0aW1lVmlkZW9T b3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U6OmNh cHR1cmVTaXplIGNvbnN0KTogIkNhcHR1cmUiIGF0IHRoZSBwcmVzZXQgc2l6ZSwgbm90IAorICAg ICAgICBuZWNlc3NhcmlseSBhdCB0aGUgcmVxdWVzdGVkIHNpemUgdG8gYmUgbW9yZSBsaWtlIGEg cGh5c2ljYWwgY2FtZXJhLgorICAgICAgICAoV2ViQ29yZTo6TW9ja1JlYWx0aW1lVmlkZW9Tb3Vy Y2U6OnNldHRpbmdzRGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1vY2tSZWFsdGltZVZp ZGVvU291cmNlOjpkcmF3QW5pbWF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6Ok1vY2tSZWFsdGlt ZVZpZGVvU291cmNlOjpkcmF3Qm94ZXMpOgorICAgICAgICAoV2ViQ29yZTo6TW9ja1JlYWx0aW1l VmlkZW9Tb3VyY2U6OmRyYXdUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1vY2tSZWFsdGltZVZp ZGVvU291cmNlOjpnZW5lcmF0ZUZyYW1lKToKKyAgICAgICAgKFdlYkNvcmU6Ok1vY2tSZWFsdGlt ZVZpZGVvU291cmNlOjppbWFnZUJ1ZmZlciBjb25zdCk6CisgICAgICAgICogcGxhdGZvcm0vbW9j ay9Nb2NrUmVhbHRpbWVWaWRlb1NvdXJjZS5oOgorCiAyMDE4LTEyLTA3ICBFcmljIENhcmxzb24g IDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFtNZWRpYVN0cmVhbV0gJ2Rldmlj ZWNoYW5nZScgZXZlbnQgc2hvdWxkIG5vdCBmaXJlIGluIGZyYW1lcyB0aGF0IGNhbid0IGFjY2Vz cyBjYXB0dXJlIGRldmljZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2N2L0ltYWdlVHJhbnNmZXJTZXNzaW9uVlQubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jdi9JbWFnZVRyYW5zZmVyU2Vzc2lvblZULm1tCmluZGV4IDI0YWE0OGM0 MWM5MzIyMzNiNTM0ODRkNGM3NGU3OTM3ZmE4YzVlNjkuLjljMjFiZTcxMDgxMjY3YjJjZDkyMmE2 OTJjYzc2ZTQ4MWIzMzJkMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2N2L0ltYWdlVHJhbnNmZXJTZXNzaW9uVlQubW0KKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY3YvSW1hZ2VUcmFuc2ZlclNlc3Npb25WVC5tbQpAQCAtNTksNyAr NTksNyBAQCBJbWFnZVRyYW5zZmVyU2Vzc2lvblZUOjpJbWFnZVRyYW5zZmVyU2Vzc2lvblZUKHVp bnQzMl90IHBpeGVsRm9ybWF0KQogICAgIEFTU0VSVCh0cmFuc2ZlclNlc3Npb24pOwogICAgIG1f dHJhbnNmZXJTZXNzaW9uID0gYWRvcHRDRih0cmFuc2ZlclNlc3Npb24pOwogCi0gICAgYXV0byBz dGF0dXMgPSBWVFNlc3Npb25TZXRQcm9wZXJ0eSh0cmFuc2ZlclNlc3Npb24sIGtWVFBpeGVsVHJh bnNmZXJQcm9wZXJ0eUtleV9TY2FsaW5nTW9kZSwga1ZUU2NhbGluZ01vZGVfVHJpbSk7CisgICAg YXV0byBzdGF0dXMgPSBWVFNlc3Npb25TZXRQcm9wZXJ0eSh0cmFuc2ZlclNlc3Npb24sIGtWVFBp eGVsVHJhbnNmZXJQcm9wZXJ0eUtleV9TY2FsaW5nTW9kZSwga1ZUU2NhbGluZ01vZGVfTGV0dGVy Ym94KTsKICAgICBpZiAoc3RhdHVzICE9IGtDVlJldHVyblN1Y2Nlc3MpCiAgICAgICAgIFJFTEVB U0VfTE9HKE1lZGlhLCAiSW1hZ2VUcmFuc2ZlclNlc3Npb25WVDo6SW1hZ2VUcmFuc2ZlclNlc3Np b25WVDogVlRTZXNzaW9uU2V0UHJvcGVydHkoa1ZUUGl4ZWxUcmFuc2ZlclByb3BlcnR5S2V5X1Nj YWxpbmdNb2RlKSBmYWlsZWQgd2l0aCBlcnJvciAlZCIsIHN0YXRpY19jYXN0PGludD4oc3RhdHVz KSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21vY2svTW9ja1JlYWx0 aW1lVmlkZW9Tb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbW9jay9Nb2NrUmVh bHRpbWVWaWRlb1NvdXJjZS5jcHAKaW5kZXggZGNmZmFiZGNiMzA2NzU3ZWMzYjIwM2Q0MDYwMTZi OWM1MmVhNmFlNi4uYjEyZGQ0YTNkMWFiNzNmN2RkMTk2MTBmYWNkN2RkOGQ2OTI1YmNlMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbW9jay9Nb2NrUmVhbHRpbWVWaWRlb1Nv dXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbW9jay9Nb2NrUmVhbHRpbWVW aWRlb1NvdXJjZS5jcHAKQEAgLTE3OCwxMSArMTc4LDE2IEBAIGNvbnN0IFJlYWx0aW1lTWVkaWFT b3VyY2VTZXR0aW5ncyYgTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U6OnNldHRpbmdzKCkKICAgICBy ZXR1cm4gbV9jdXJyZW50U2V0dGluZ3MudmFsdWUoKTsKIH0KIAorSW50U2l6ZSBNb2NrUmVhbHRp bWVWaWRlb1NvdXJjZTo6Y2FwdHVyZVNpemUoKSBjb25zdAoreworICAgIHJldHVybiBtX3ByZXNl dCA/IG1fcHJlc2V0LT5zaXplIDogdGhpcy0+c2l6ZSgpOworfQorCiB2b2lkIE1vY2tSZWFsdGlt ZVZpZGVvU291cmNlOjpzZXR0aW5nc0RpZENoYW5nZShPcHRpb25TZXQ8UmVhbHRpbWVNZWRpYVNv dXJjZVNldHRpbmdzOjpGbGFnPiBzZXR0aW5ncykKIHsKICAgICBtX2N1cnJlbnRTZXR0aW5ncyA9 IHN0ZDo6bnVsbG9wdDsKICAgICBpZiAoc2V0dGluZ3MuY29udGFpbnNBbnkoeyBSZWFsdGltZU1l ZGlhU291cmNlU2V0dGluZ3M6OkZsYWc6OldpZHRoLCBSZWFsdGltZU1lZGlhU291cmNlU2V0dGlu Z3M6OkZsYWc6OkhlaWdodCB9KSkgewotICAgICAgICBtX2Jhc2VGb250U2l6ZSA9IHNpemUoKS5o ZWlnaHQoKSAqIC4wODsKKyAgICAgICAgbV9iYXNlRm9udFNpemUgPSBjYXB0dXJlU2l6ZSgpLmhl aWdodCgpICogLjA4OwogICAgICAgICBtX2JpcEJvcEZvbnRTaXplID0gbV9iYXNlRm9udFNpemUg KiAyLjU7CiAgICAgICAgIG1fc3RhdHNGb250U2l6ZSA9IG1fYmFzZUZvbnRTaXplICogLjU7CiAg ICAgICAgIG1faW1hZ2VCdWZmZXIgPSBudWxscHRyOwpAQCAtMjE4LDggKzIyMyw5IEBAIFNlY29u ZHMgTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U6OmVsYXBzZWRUaW1lKCkKIAogdm9pZCBNb2NrUmVh bHRpbWVWaWRlb1NvdXJjZTo6ZHJhd0FuaW1hdGlvbihHcmFwaGljc0NvbnRleHQmIGNvbnRleHQp CiB7Ci0gICAgZmxvYXQgcmFkaXVzID0gc2l6ZSgpLndpZHRoKCkgKiAuMDk7Ci0gICAgRmxvYXRQ b2ludCBsb2NhdGlvbihzaXplKCkud2lkdGgoKSAqIC44LCBzaXplKCkuaGVpZ2h0KCkgKiAuMyk7 CisgICAgYXV0byBzaXplID0gY2FwdHVyZVNpemUoKTsKKyAgICBmbG9hdCByYWRpdXMgPSBzaXpl LndpZHRoKCkgKiAuMDk7CisgICAgRmxvYXRQb2ludCBsb2NhdGlvbihzaXplLndpZHRoKCkgKiAu OCwgc2l6ZS5oZWlnaHQoKSAqIC4zKTsKIAogICAgIG1fcGF0aC5jbGVhcigpOwogICAgIG1fcGF0 aC5tb3ZlVG8obG9jYXRpb24pOwpAQCAtMjQ4LDcgKzI1NCw3IEBAIHZvaWQgTW9ja1JlYWx0aW1l VmlkZW9Tb3VyY2U6OmRyYXdCb3hlcyhHcmFwaGljc0NvbnRleHQmIGNvbnRleHQpCiAgICAgc3Rh dGljIGNvbnN0IFJHQkEzMiBncmVlbiA9IDB4ZmYwMDgwMDA7CiAgICAgc3RhdGljIGNvbnN0IFJH QkEzMiBjeWFuID0gMHhGRjAwRkZGRjsKIAotICAgIEludFNpemUgc2l6ZSA9IHRoaXMtPnNpemUo KTsKKyAgICBJbnRTaXplIHNpemUgPSBjYXB0dXJlU2l6ZSgpOwogICAgIGZsb2F0IGJveFNpemUg PSBzaXplLndpZHRoKCkgKiAuMDM1OwogICAgIGZsb2F0IGJveFRvcCA9IHNpemUuaGVpZ2h0KCkg KiAuNjsKIApAQCAtMzMwLDggKzMzNiw4IEBAIHZvaWQgTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U6 OmRyYXdUZXh0KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCkKICAgICBGb250Q2FzY2FkZSBzdGF0 c0ZvbnQgeyBXVEZNb3ZlKGZvbnREZXNjcmlwdGlvbiksIDAsIDAgfTsKICAgICBzdGF0c0ZvbnQu dXBkYXRlKG51bGxwdHIpOwogCi0gICAgSW50U2l6ZSBzaXplID0gdGhpcy0+c2l6ZSgpOwotICAg IEZsb2F0UG9pbnQgdGltZUxvY2F0aW9uKHNpemUud2lkdGgoKSAqIC4wNSwgc2l6ZS5oZWlnaHQo KSAqIC4xNSk7CisgICAgSW50U2l6ZSBjYXB0dXJlU2l6ZSA9IHRoaXMtPmNhcHR1cmVTaXplKCk7 CisgICAgRmxvYXRQb2ludCB0aW1lTG9jYXRpb24oY2FwdHVyZVNpemUud2lkdGgoKSAqIC4wNSwg Y2FwdHVyZVNpemUuaGVpZ2h0KCkgKiAuMTUpOwogICAgIGNvbnRleHQuc2V0RmlsbENvbG9yKENv bG9yOjp3aGl0ZSk7CiAgICAgY29udGV4dC5zZXRUZXh0RHJhd2luZ01vZGUoVGV4dE1vZGVGaWxs KTsKICAgICBTdHJpbmcgc3RyaW5nID0gU3RyaW5nOjpmb3JtYXQoIiUwMnU6JTAydTolMDJ1LiUw M3UiLCBob3VycywgbWludXRlcywgc2Vjb25kcywgbWlsbGlzZWNvbmRzICUgMTAwMCk7CkBAIC0z NDEsNyArMzQ3LDcgQEAgdm9pZCBNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZTo6ZHJhd1RleHQoR3Jh cGhpY3NDb250ZXh0JiBjb250ZXh0KQogICAgIHRpbWVMb2NhdGlvbi5tb3ZlKDAsIG1fYmFzZUZv bnRTaXplKTsKICAgICBjb250ZXh0LmRyYXdUZXh0KHRpbWVGb250LCBUZXh0UnVuKChTdHJpbmdW aWV3KHN0cmluZykpKSwgdGltZUxvY2F0aW9uKTsKIAotICAgIEZsb2F0UG9pbnQgc3RhdHNMb2Nh dGlvbihzaXplLndpZHRoKCkgKiAuNDUsIHNpemUuaGVpZ2h0KCkgKiAuNzUpOworICAgIEZsb2F0 UG9pbnQgc3RhdHNMb2NhdGlvbihjYXB0dXJlU2l6ZS53aWR0aCgpICogLjQ1LCBjYXB0dXJlU2l6 ZS5oZWlnaHQoKSAqIC43NSk7CiAgICAgc3RyaW5nID0gU3RyaW5nOjpmb3JtYXQoIlJlcXVlc3Rl ZCBmcmFtZSByYXRlOiAlLjFmIGZwcyIsIGZyYW1lUmF0ZSgpKTsKICAgICBjb250ZXh0LmRyYXdU ZXh0KHN0YXRzRm9udCwgVGV4dFJ1bigoU3RyaW5nVmlldyhzdHJpbmcpKSksIHN0YXRzTG9jYXRp b24pOwogCkBAIC0zNDksMTAgKzM1NSwxNSBAQCB2b2lkIE1vY2tSZWFsdGltZVZpZGVvU291cmNl OjpkcmF3VGV4dChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQpCiAgICAgc3RyaW5nID0gU3RyaW5n Ojpmb3JtYXQoIk9ic2VydmVkIGZyYW1lIHJhdGU6ICUuMWYgZnBzIiwgb2JzZXJ2ZWRGcmFtZVJh dGUoKSk7CiAgICAgY29udGV4dC5kcmF3VGV4dChzdGF0c0ZvbnQsIFRleHRSdW4oKFN0cmluZ1Zp ZXcoc3RyaW5nKSkpLCBzdGF0c0xvY2F0aW9uKTsKIAorICAgIGF1dG8gc2l6ZSA9IHRoaXMtPnNp emUoKTsKICAgICBzdGF0c0xvY2F0aW9uLm1vdmUoMCwgbV9zdGF0c0ZvbnRTaXplKTsKICAgICBz dHJpbmcgPSBTdHJpbmc6OmZvcm1hdCgiU2l6ZTogJXUgeCAldSIsIHNpemUud2lkdGgoKSwgc2l6 ZS5oZWlnaHQoKSk7CiAgICAgY29udGV4dC5kcmF3VGV4dChzdGF0c0ZvbnQsIFRleHRSdW4oKFN0 cmluZ1ZpZXcoc3RyaW5nKSkpLCBzdGF0c0xvY2F0aW9uKTsKIAorICAgIHN0YXRzTG9jYXRpb24u bW92ZSgwLCBtX3N0YXRzRm9udFNpemUpOworICAgIHN0cmluZyA9IFN0cmluZzo6Zm9ybWF0KCJQ cmVzZXQgc2l6ZTogJXUgeCAldSIsIGNhcHR1cmVTaXplLndpZHRoKCksIGNhcHR1cmVTaXplLmhl aWdodCgpKTsKKyAgICBjb250ZXh0LmRyYXdUZXh0KHN0YXRzRm9udCwgVGV4dFJ1bigoU3RyaW5n VmlldyhzdHJpbmcpKSksIHN0YXRzTG9jYXRpb24pOworCiAgICAgaWYgKG1vY2tDYW1lcmEoKSkg ewogICAgICAgICBjb25zdCBjaGFyKiBjYW1lcmE7CiAgICAgICAgIHN3aXRjaCAoZmFjaW5nTW9k ZSgpKSB7CkBAIC0zODAsNyArMzkxLDcgQEAgdm9pZCBNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZTo6 ZHJhd1RleHQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0KQogICAgICAgICBjb250ZXh0LmRyYXdU ZXh0KHN0YXRzRm9udCwgVGV4dFJ1biB7IG5hbWUoKSB9LCBzdGF0c0xvY2F0aW9uKTsKICAgICB9 CiAKLSAgICBGbG9hdFBvaW50IGJpcEJvcExvY2F0aW9uKHNpemUud2lkdGgoKSAqIC42LCBzaXpl LmhlaWdodCgpICogLjYpOworICAgIEZsb2F0UG9pbnQgYmlwQm9wTG9jYXRpb24oY2FwdHVyZVNp emUud2lkdGgoKSAqIC42LCBjYXB0dXJlU2l6ZS5oZWlnaHQoKSAqIC42KTsKICAgICB1bnNpZ25l ZCBmcmFtZU1vZCA9IG1fZnJhbWVOdW1iZXIgJSA2MDsKICAgICBpZiAoZnJhbWVNb2QgPD0gMTUp IHsKICAgICAgICAgY29udGV4dC5zZXRGaWxsQ29sb3IoQ29sb3I6OmN5YW4pOwpAQCAtNDEzLDcg KzQyNCw3IEBAIHZvaWQgTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U6OmdlbmVyYXRlRnJhbWUoKQog ICAgIEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCA9IGJ1ZmZlci0+Y29udGV4dCgpOwogICAgIEdy YXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcihjb250ZXh0KTsKIAotICAgIGF1dG8m IHNpemUgPSB0aGlzLT5zaXplKCk7CisgICAgYXV0byBzaXplID0gY2FwdHVyZVNpemUoKTsKICAg ICBGbG9hdFJlY3QgZnJhbWVSZWN0KEZsb2F0UG9pbnQoKSwgc2l6ZSk7CiAKICAgICBjb250ZXh0 LmZpbGxSZWN0KEZsb2F0UmVjdChGbG9hdFBvaW50KCksIHNpemUpLCBtX2ZpbGxDb2xvcik7CkBA IC00MzIsNyArNDQzLDcgQEAgSW1hZ2VCdWZmZXIqIE1vY2tSZWFsdGltZVZpZGVvU291cmNlOjpp bWFnZUJ1ZmZlcigpIGNvbnN0CiAgICAgaWYgKG1faW1hZ2VCdWZmZXIpCiAgICAgICAgIHJldHVy biBtX2ltYWdlQnVmZmVyLmdldCgpOwogCi0gICAgbV9pbWFnZUJ1ZmZlciA9IEltYWdlQnVmZmVy OjpjcmVhdGUoc2l6ZSgpLCBVbmFjY2VsZXJhdGVkKTsKKyAgICBtX2ltYWdlQnVmZmVyID0gSW1h Z2VCdWZmZXI6OmNyZWF0ZShjYXB0dXJlU2l6ZSgpLCBVbmFjY2VsZXJhdGVkKTsKICAgICBpZiAo IW1faW1hZ2VCdWZmZXIpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL01vY2tSZWFsdGltZVZpZGVvU291cmNlLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL01vY2tSZWFsdGltZVZpZGVvU291cmNlLmgKaW5k ZXggYmQzYzNlNDUxOWFmN2U4NWZjY2IyNjk4MzllNWRiNmU4OTMwY2Y1YS4uMDc1YzBlZmMyNWNj ZWY3OWVjMjgxYzhjMmEwMDljMjcyMmY2YmI0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbW9jay9Nb2NrUmVhbHRpbWVWaWRlb1NvdXJjZS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21vY2svTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2UuaApAQCAtNzAsNiArNzAs OCBAQCBwcml2YXRlOgogICAgIGJvb2wgaXNDYXB0dXJlU291cmNlKCkgY29uc3QgZmluYWwgeyBy ZXR1cm4gdHJ1ZTsgfQogICAgIGJvb2wgc3VwcG9ydHNTaXplQW5kRnJhbWVSYXRlKHN0ZDo6b3B0 aW9uYWw8aW50PiB3aWR0aCwgc3RkOjpvcHRpb25hbDxpbnQ+IGhlaWdodCwgc3RkOjpvcHRpb25h bDxkb3VibGU+KSBmaW5hbDsKICAgICB2b2lkIHNldFNpemVBbmRGcmFtZVJhdGUoc3RkOjpvcHRp b25hbDxpbnQ+IHdpZHRoLCBzdGQ6Om9wdGlvbmFsPGludD4gaGVpZ2h0LCBzdGQ6Om9wdGlvbmFs PGRvdWJsZT4pIGZpbmFsOworICAgIHZvaWQgc2V0U2l6ZUFuZEZyYW1lUmF0ZVdpdGhQcmVzZXQo SW50U2l6ZSwgZG91YmxlLCBSZWZQdHI8VmlkZW9QcmVzZXQ+IHByZXNldCkgZmluYWwgeyBtX3By ZXNldCA9IHByZXNldDsgfQorICAgIEludFNpemUgY2FwdHVyZVNpemUoKSBjb25zdDsKIAogICAg IHZvaWQgZ2VuZXJhdGVQcmVzZXRzKCkgZmluYWw7CiAKQEAgLTEwOCw2ICsxMTAsNyBAQCBwcml2 YXRlOgogICAgIFJlYWx0aW1lTWVkaWFTb3VyY2VTdXBwb3J0ZWRDb25zdHJhaW50cyBtX3N1cHBv cnRlZENvbnN0cmFpbnRzOwogICAgIENvbG9yIG1fZmlsbENvbG9yIHsgQ29sb3I6OmJsYWNrIH07 CiAgICAgTW9ja01lZGlhRGV2aWNlIG1fZGV2aWNlOworICAgIFJlZlB0cjxWaWRlb1ByZXNldD4g bV9wcmVzZXQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYzdlMjM4OWVk OWQ5OGZiNDg0Y2MxZTFlOTgyZjNjOTFkMTcwMzg3OS4uMDRjYTY2MWJhZjlkN2YxYzhjNGY1YWM4 YTVmZTVkZGU1M2Q4NzEyMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE4LTEyLTA4ICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVh bV0gU2NhbGVkIHZpZGVvIGZyYW1lcyBzaG91bGQgYmUgcmVzaXplZCBpbiBsZXR0ZXJib3ggbW9k ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkyNTI4 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NjU3NjYzOD4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvbWVkaWFzdHJlYW0vcmVzaXplLWxl dHRlcmJveC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbWVkaWFzdHJlYW0v cmVzaXplLWxldHRlcmJveC5odG1sOiBBZGRlZC4KKwogMjAxOC0xMi0wNyAgRXJpYyBDYXJsc29u ICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWVkaWFTdHJlYW1dICdkZXZp Y2VjaGFuZ2UnIGV2ZW50IHNob3VsZCBub3QgZmlyZSBpbiBmcmFtZXMgdGhhdCBjYW4ndCBhY2Nl c3MgY2FwdHVyZSBkZXZpY2VzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3Ry ZWFtL3Jlc2l6ZS1sZXR0ZXJib3gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRp YXN0cmVhbS9yZXNpemUtbGV0dGVyYm94LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40YzAxODU4 NGE0OTA0NWYyZjYwMzVkZmI4MmUyYmUyY2M4OTEwMmJkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9yZXNpemUtbGV0dGVyYm94LWV4cGVjdGVkLnR4dApA QCAtMCwwICsxLDQgQEAKKworCitQQVNTIFZpZGVvIGZyYW1lcyBhcmUgcmVzaXplZCBpbiBsZXR0 ZXJib3gtbW9kZSB3aGVuIGNhcHR1cmVkIGF0IG5vbi1uYXRpdmUgc2l6ZS4gCisKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vcmVzaXplLWxldHRlcmJveC5odG1sIGIv TGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9yZXNpemUtbGV0dGVyYm94Lmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uYzYxZDEwNjY1YjQxOTIzYTg1YzBmMDBiMzE4ODQzNDkzYzE0MWIzNgotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vcmVzaXplLWxldHRlcmJveC5o dG1sCkBAIC0wLDAgKzEsNjcgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+CisgICAgPGhlYWQ+ CisgICAgICAgIDx2aWRlbyBpZD0idmlkZW8iIGF1dG9wbGF5IHdpZHRoPTQ4MHB4IGhlaWdodD00 ODBweCBjb250cm9scyA+PC92aWRlbz4KKyAgICAgICAgPGNhbnZhcyBpZD0iY2FudmFzIiB3aWR0 aD00ODBweCBoZWlnaHQ9NDgwcHg+PC9jYW52YXM+CisgICAgICAgIDxzY3JpcHQgc3JjPSIuLi8u Li9yZXNvdXJjZXMvdGVzdGhhcm5lc3MuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNy Yz0iLi4vLi4vcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4KKyAgICAg ICAgPHNjcmlwdD4KKworY29uc3QgY2FudmFzID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNh bnZhcyIpOworY29uc3QgdmlkZW8gPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidmlkZW8iKTsK KworZnVuY3Rpb24gaXNQaXhlbEJsYWNrKHBpeGVsKQoreworICAgIHJldHVybiBwaXhlbFswXSA9 PT0gMCAmJiBwaXhlbFsxXSA9PT0gMCAmJiBwaXhlbFsyXSA9PT0gMCAmJiBwaXhlbFszXSA9PT0g MjU1OworfQorCitmdW5jdGlvbiBpc1BpeGVsR3JheShwaXhlbCkKK3sKKyAgICByZXR1cm4gcGl4 ZWxbMF0gPT09IDEyOCAmJiBwaXhlbFsxXSA9PT0gMTI4ICYmIHBpeGVsWzJdID09PSAxMjggJiYg cGl4ZWxbM10gPT09IDI1NTsKK30KKworZnVuY3Rpb24gbG9nUGl4ZWwobmFtZSwgcGl4ZWwpCit7 CisgICAgY29uc29sZS5sb2coYCR7bmFtZX06ICR7cGl4ZWxbMF19LCAke3BpeGVsWzFdfSwgJHtw aXhlbFsyXX0sICR7cGl4ZWxbM119YCk7Cit9CisKK2Z1bmN0aW9uIGNoZWNrQ2FudmFzKGNhbnZh cywgc3RyZWFtKQoreworICAgIHJldHVybiBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9 PiB7CisgICAgICAgIHZpZGVvLnNyY09iamVjdCA9IHN0cmVhbTsKKyAgICAgICAgdmlkZW8ub25w bGF5ID0gKCkgPT4geworICAgICAgICAgICAgY29uc3QgY3R4ID0gY2FudmFzLmdldENvbnRleHQo IjJkIik7CisgICAgICAgICAgICBjdHguZHJhd0ltYWdlKHZpZGVvLCAwICwwKTsKKworICAgICAg ICAgICAgdHJ5IHsKKyAgICAgICAgICAgICAgICBzZXRUaW1lb3V0KCgpID0+IHsKKyAgICAgICAg ICAgICAgICAgICAgYXNzZXJ0X3RydWUoaXNQaXhlbEJsYWNrKGN0eC5nZXRJbWFnZURhdGEoNSwg NSwgMSwgMSkuZGF0YSksICJQaXhlbCBhdCA1eDUgaXMgTk9UIGZyb20gY2FtZXJhLiIpOworICAg ICAgICAgICAgICAgICAgICBhc3NlcnRfdHJ1ZShpc1BpeGVsR3JheShjdHguZ2V0SW1hZ2VEYXRh KDUwLCAyMDAsIDEsIDEpLmRhdGEpLCAiUGl4ZWwgYXQgNTB4MjAwIGlzIGZyb20gY2FtZXJhLiIp OworICAgICAgICAgICAgICAgICAgICByZXNvbHZlKCk7CisgICAgICAgICAgICAgICAgfSwgNTAw KTsKKyAgICAgICAgICAgIH0gY2F0Y2goZXJyKSB7CisgICAgICAgICAgICAgICAgcmVqZWN0KGVy cik7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorICAgICAgICB9Cisg ICAgfSk7Cit9CisKK3Byb21pc2VfdGVzdChhc3luYyAoKSA9PiB7CisgICAgbGV0IHN0cmVhbSA9 IGF3YWl0IG5hdmlnYXRvci5tZWRpYURldmljZXMuZ2V0VXNlck1lZGlhKHsgdmlkZW86IHRydWUg fSk7CisgICAgc3RyZWFtID0gbnVsbDsKKworICAgIGNvbnN0IGRldmljZXMgPSBhd2FpdCBuYXZp Z2F0b3IubWVkaWFEZXZpY2VzLmVudW1lcmF0ZURldmljZXMoKTsKKyAgICBsZXQgY2FtZXJhSUQg PSB1bmRlZmluZWQ7CisgICAgZGV2aWNlcy5mb3JFYWNoKGRldmljZSA9PiB7IGlmIChkZXZpY2Uu bGFiZWwgPT0gIk1vY2sgdmlkZW8gZGV2aWNlIDIiKSBjYW1lcmFJRCA9IGRldmljZS5kZXZpY2VJ ZDsgfSk7CisgICAgYXNzZXJ0X3RydWUoY2FtZXJhSUQgIT09IHVuZGVmaW5lZCwgIkZvdW5kIGNh bWVyYTIiKTsKKyAgICAKKyAgICBzdHJlYW0gPSBhd2FpdCBuYXZpZ2F0b3IubWVkaWFEZXZpY2Vz LmdldFVzZXJNZWRpYSh7IHZpZGVvOiB7IGRldmljZUlkOiB7IGV4YWN0OiBjYW1lcmFJRCB9LCB3 aWR0aDogNDgwLCBoZWlnaHQ6IDQ4MCB9IH0pOworICAgIAorICAgIHJldHVybiBjaGVja0NhbnZh cyhjYW52YXMsIHN0cmVhbSk7CisKK30sICJWaWRlbyBmcmFtZXMgYXJlIHJlc2l6ZWQgaW4gbGV0 dGVyYm94LW1vZGUgd2hlbiBjYXB0dXJlZCBhdCBub24tbmF0aXZlIHNpemUuIik7CisKKyAgICAg ICAgPC9zY3JpcHQ+CisgICAgPC9oZWFkPgorPC9odG1sPgo= 356893 2018-12-08 17:01:02 -0800 2018-12-08 21:36:51 -0800 Patch bug-192528-20181208170101.patch text/plain 15262 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5MDA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQ0MDkzMTQ1MjA3MGQ5 ZDUwNDdhZDQzNDk2NWNmYmQ3YWNiMWUyNy4uNGNiNWU3NDgzODE3MmFmYmUwYmUwMWZhMGRjM2I5 YzkxZjVlNmY3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE4LTEyLTA4ICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVh bV0gU2NhbGVkIHZpZGVvIGZyYW1lcyBzaG91bGQgYmUgcmVzaXplZCBpbiBsZXR0ZXJib3ggbW9k ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkyNTI4 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NjU3NjYzOD4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBmYXN0L21lZGlhc3RyZWFtL3Jlc2l6 ZS1sZXR0ZXJib3guaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY3YvSW1hZ2VU cmFuc2ZlclNlc3Npb25WVC5tbToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlVHJhbnNmZXJTZXNz aW9uVlQ6OkltYWdlVHJhbnNmZXJTZXNzaW9uVlQpOiBVc2UgbGV0dGVyYm94IHJlc2l6ZSBtb2Rl LCBub3QgdHJpbS4KKworICAgICAgICAqIHBsYXRmb3JtL21vY2svTW9ja1JlYWx0aW1lVmlkZW9T b3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U6OmNh cHR1cmVTaXplIGNvbnN0KTogIkNhcHR1cmUiIGF0IHRoZSBwcmVzZXQgc2l6ZSwgbm90IAorICAg ICAgICBuZWNlc3NhcmlseSBhdCB0aGUgcmVxdWVzdGVkIHNpemUgdG8gYmUgbW9yZSBsaWtlIGEg cGh5c2ljYWwgY2FtZXJhLgorICAgICAgICAoV2ViQ29yZTo6TW9ja1JlYWx0aW1lVmlkZW9Tb3Vy Y2U6OnNldHRpbmdzRGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1vY2tSZWFsdGltZVZp ZGVvU291cmNlOjpkcmF3QW5pbWF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6Ok1vY2tSZWFsdGlt ZVZpZGVvU291cmNlOjpkcmF3Qm94ZXMpOgorICAgICAgICAoV2ViQ29yZTo6TW9ja1JlYWx0aW1l VmlkZW9Tb3VyY2U6OmRyYXdUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1vY2tSZWFsdGltZVZp ZGVvU291cmNlOjpnZW5lcmF0ZUZyYW1lKToKKyAgICAgICAgKFdlYkNvcmU6Ok1vY2tSZWFsdGlt ZVZpZGVvU291cmNlOjppbWFnZUJ1ZmZlciBjb25zdCk6CisgICAgICAgICogcGxhdGZvcm0vbW9j ay9Nb2NrUmVhbHRpbWVWaWRlb1NvdXJjZS5oOgorCiAyMDE4LTEyLTA3ICBFcmljIENhcmxzb24g IDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFtNZWRpYVN0cmVhbV0gJ2Rldmlj ZWNoYW5nZScgZXZlbnQgc2hvdWxkIG5vdCBmaXJlIGluIGZyYW1lcyB0aGF0IGNhbid0IGFjY2Vz cyBjYXB0dXJlIGRldmljZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nv Y29hL1ZpZGVvVG9vbGJveFNvZnRMaW5rLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nv Y29hL1ZpZGVvVG9vbGJveFNvZnRMaW5rLmNwcAppbmRleCBlYWY3OGI0NWQwNTI4N2E3OTZlNmEy YTA1Y2QwZThmMGE4OTk0ZDNmLi5iMGEyMmQ4YzNkNDY1MDRmZjFlNjVhZmRiNTkxNmQyOTkyMzRl Y2E0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9WaWRlb1Rvb2xi b3hTb2Z0TGluay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvVmlkZW9U b29sYm94U29mdExpbmsuY3BwCkBAIC01OCw3ICs1OCw3IEBAIFNPRlRfTElOS19GVU5DVElPTl9G T1JfU09VUkNFKFdlYkNvcmUsIFZpZGVvVG9vbGJveCwgVlRQaXhlbFRyYW5zZmVyU2Vzc2lvbkNy ZWF0CiBTT0ZUX0xJTktfRlVOQ1RJT05fRk9SX1NPVVJDRShXZWJDb3JlLCBWaWRlb1Rvb2xib3gs IFZUUGl4ZWxUcmFuc2ZlclNlc3Npb25UcmFuc2ZlckltYWdlLCBPU1N0YXR1cywgKFZUUGl4ZWxU cmFuc2ZlclNlc3Npb25SZWYgc2Vzc2lvbiwgQ1ZQaXhlbEJ1ZmZlclJlZiBzb3VyY2VCdWZmZXIs IENWUGl4ZWxCdWZmZXJSZWYgZGVzdGluYXRpb25CdWZmZXIpLCAoc2Vzc2lvbiwgc291cmNlQnVm ZmVyLCBkZXN0aW5hdGlvbkJ1ZmZlcikpCiBTT0ZUX0xJTktfRlVOQ1RJT05fRk9SX1NPVVJDRShX ZWJDb3JlLCBWaWRlb1Rvb2xib3gsIFZUU2Vzc2lvblNldFByb3BlcnR5LCBPU1N0YXR1cywgKFZU U2Vzc2lvblJlZiBzZXNzaW9uLCBDRlN0cmluZ1JlZiBwcm9wZXJ0eUtleSwgQ0ZUeXBlUmVmIHBy b3BlcnR5VmFsdWUpLCAoc2Vzc2lvbiwgcHJvcGVydHlLZXksIHByb3BlcnR5VmFsdWUpKQogU09G VF9MSU5LX0NPTlNUQU5UX0ZPUl9TT1VSQ0UoV2ViQ29yZSwgVmlkZW9Ub29sYm94LCBrVlRQaXhl bFRyYW5zZmVyUHJvcGVydHlLZXlfU2NhbGluZ01vZGUsIENGU3RyaW5nUmVmKQotU09GVF9MSU5L X0NPTlNUQU5UX0ZPUl9TT1VSQ0UoV2ViQ29yZSwgVmlkZW9Ub29sYm94LCBrVlRTY2FsaW5nTW9k ZV9UcmltLCBDRlN0cmluZ1JlZikKK1NPRlRfTElOS19DT05TVEFOVF9GT1JfU09VUkNFKFdlYkNv cmUsIFZpZGVvVG9vbGJveCwga1ZUU2NhbGluZ01vZGVfTGV0dGVyYm94LCBDRlN0cmluZ1JlZikK IFNPRlRfTElOS19DT05TVEFOVF9GT1JfU09VUkNFKFdlYkNvcmUsIFZpZGVvVG9vbGJveCwga1ZU UGl4ZWxUcmFuc2ZlclByb3BlcnR5S2V5X0VuYWJsZUhhcmR3YXJlQWNjZWxlcmF0ZWRUcmFuc2Zl ciwgQ0ZTdHJpbmdSZWYpCiBTT0ZUX0xJTktfQ09OU1RBTlRfRk9SX1NPVVJDRShXZWJDb3JlLCBW aWRlb1Rvb2xib3gsIGtWVFBpeGVsVHJhbnNmZXJQcm9wZXJ0eUtleV9FbmFibGVIaWdoU3BlZWRU cmFuc2ZlciwgQ0ZTdHJpbmdSZWYpCiBTT0ZUX0xJTktfQ09OU1RBTlRfRk9SX1NPVVJDRShXZWJD b3JlLCBWaWRlb1Rvb2xib3gsIGtWVFBpeGVsVHJhbnNmZXJQcm9wZXJ0eUtleV9SZWFsVGltZSwg Q0ZTdHJpbmdSZWYpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9W aWRlb1Rvb2xib3hTb2Z0TGluay5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvVmlk ZW9Ub29sYm94U29mdExpbmsuaAppbmRleCAwNzFiNzExZWQwNGQzYjgxNDgyMjg5MmExNTBkN2Fl NWZkZTZmODU1Li45ZjM0NWRkOGE0MzNkMDAyNGUxNmI1YjliNDg1ZmI2MDdlMWM4NjQ3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9WaWRlb1Rvb2xib3hTb2Z0TGlu ay5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1ZpZGVvVG9vbGJveFNvZnRM aW5rLmgKQEAgLTgzLDggKzgzLDggQEAgU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9IRUFERVIoV2Vi Q29yZSwgVmlkZW9Ub29sYm94LCBWVFNlc3Npb25TZXRQcm9wZXJ0eSwgT1NTdGEKIAogU09GVF9M SU5LX0NPTlNUQU5UX0ZPUl9IRUFERVIoV2ViQ29yZSwgVmlkZW9Ub29sYm94LCBrVlRQaXhlbFRy YW5zZmVyUHJvcGVydHlLZXlfU2NhbGluZ01vZGUsIENGU3RyaW5nUmVmKQogI2RlZmluZSBrVlRQ aXhlbFRyYW5zZmVyUHJvcGVydHlLZXlfU2NhbGluZ01vZGUgZ2V0X1ZpZGVvVG9vbGJveF9rVlRQ aXhlbFRyYW5zZmVyUHJvcGVydHlLZXlfU2NhbGluZ01vZGUoKQotU09GVF9MSU5LX0NPTlNUQU5U X0ZPUl9IRUFERVIoV2ViQ29yZSwgVmlkZW9Ub29sYm94LCBrVlRTY2FsaW5nTW9kZV9UcmltLCBD RlN0cmluZ1JlZikKLSNkZWZpbmUga1ZUU2NhbGluZ01vZGVfVHJpbSBnZXRfVmlkZW9Ub29sYm94 X2tWVFNjYWxpbmdNb2RlX1RyaW0oKQorU09GVF9MSU5LX0NPTlNUQU5UX0ZPUl9IRUFERVIoV2Vi Q29yZSwgVmlkZW9Ub29sYm94LCBrVlRTY2FsaW5nTW9kZV9MZXR0ZXJib3gsIENGU3RyaW5nUmVm KQorI2RlZmluZSBrVlRTY2FsaW5nTW9kZV9MZXR0ZXJib3ggZ2V0X1ZpZGVvVG9vbGJveF9rVlRT Y2FsaW5nTW9kZV9MZXR0ZXJib3goKQogU09GVF9MSU5LX0NPTlNUQU5UX0ZPUl9IRUFERVIoV2Vi Q29yZSwgVmlkZW9Ub29sYm94LCBrVlRQaXhlbFRyYW5zZmVyUHJvcGVydHlLZXlfRW5hYmxlSGFy ZHdhcmVBY2NlbGVyYXRlZFRyYW5zZmVyLCBDRlN0cmluZ1JlZikKICNkZWZpbmUga1ZUUGl4ZWxU cmFuc2ZlclByb3BlcnR5S2V5X0VuYWJsZUhhcmR3YXJlQWNjZWxlcmF0ZWRUcmFuc2ZlciBnZXRf VmlkZW9Ub29sYm94X2tWVFBpeGVsVHJhbnNmZXJQcm9wZXJ0eUtleV9FbmFibGVIYXJkd2FyZUFj Y2VsZXJhdGVkVHJhbnNmZXIoKQogU09GVF9MSU5LX0NPTlNUQU5UX0ZPUl9IRUFERVIoV2ViQ29y ZSwgVmlkZW9Ub29sYm94LCBrVlRQaXhlbFRyYW5zZmVyUHJvcGVydHlLZXlfRW5hYmxlSGlnaFNw ZWVkVHJhbnNmZXIsIENGU3RyaW5nUmVmKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY3YvSW1hZ2VUcmFuc2ZlclNlc3Npb25WVC5tbSBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2N2L0ltYWdlVHJhbnNmZXJTZXNzaW9uVlQubW0KaW5kZXgg MjRhYTQ4YzQxYzkzMjIzM2I1MzQ4NGQ0Yzc0ZTc5MzdmYThjNWU2OS4uOWMyMWJlNzEwODEyNjdi MmNkOTIyYTY5MmNjNzZlNDgxYjMzMmQyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY3YvSW1hZ2VUcmFuc2ZlclNlc3Npb25WVC5tbQorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jdi9JbWFnZVRyYW5zZmVyU2Vzc2lvblZULm1tCkBA IC01OSw3ICs1OSw3IEBAIEltYWdlVHJhbnNmZXJTZXNzaW9uVlQ6OkltYWdlVHJhbnNmZXJTZXNz aW9uVlQodWludDMyX3QgcGl4ZWxGb3JtYXQpCiAgICAgQVNTRVJUKHRyYW5zZmVyU2Vzc2lvbik7 CiAgICAgbV90cmFuc2ZlclNlc3Npb24gPSBhZG9wdENGKHRyYW5zZmVyU2Vzc2lvbik7CiAKLSAg ICBhdXRvIHN0YXR1cyA9IFZUU2Vzc2lvblNldFByb3BlcnR5KHRyYW5zZmVyU2Vzc2lvbiwga1ZU UGl4ZWxUcmFuc2ZlclByb3BlcnR5S2V5X1NjYWxpbmdNb2RlLCBrVlRTY2FsaW5nTW9kZV9Ucmlt KTsKKyAgICBhdXRvIHN0YXR1cyA9IFZUU2Vzc2lvblNldFByb3BlcnR5KHRyYW5zZmVyU2Vzc2lv biwga1ZUUGl4ZWxUcmFuc2ZlclByb3BlcnR5S2V5X1NjYWxpbmdNb2RlLCBrVlRTY2FsaW5nTW9k ZV9MZXR0ZXJib3gpOwogICAgIGlmIChzdGF0dXMgIT0ga0NWUmV0dXJuU3VjY2VzcykKICAgICAg ICAgUkVMRUFTRV9MT0coTWVkaWEsICJJbWFnZVRyYW5zZmVyU2Vzc2lvblZUOjpJbWFnZVRyYW5z ZmVyU2Vzc2lvblZUOiBWVFNlc3Npb25TZXRQcm9wZXJ0eShrVlRQaXhlbFRyYW5zZmVyUHJvcGVy dHlLZXlfU2NhbGluZ01vZGUpIGZhaWxlZCB3aXRoIGVycm9yICVkIiwgc3RhdGljX2Nhc3Q8aW50 PihzdGF0dXMpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbW9jay9N b2NrUmVhbHRpbWVWaWRlb1NvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2Nr L01vY2tSZWFsdGltZVZpZGVvU291cmNlLmNwcAppbmRleCBkY2ZmYWJkY2IzMDY3NTdlYzNiMjAz ZDQwNjAxNmI5YzUyZWE2YWU2Li5iMTJkZDRhM2QxYWI3M2Y3ZGQxOTYxMGZhY2Q3ZGQ4ZDY5MjVi Y2UzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL01vY2tSZWFsdGlt ZVZpZGVvU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL01vY2tS ZWFsdGltZVZpZGVvU291cmNlLmNwcApAQCAtMTc4LDExICsxNzgsMTYgQEAgY29uc3QgUmVhbHRp bWVNZWRpYVNvdXJjZVNldHRpbmdzJiBNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZTo6c2V0dGluZ3Mo KQogICAgIHJldHVybiBtX2N1cnJlbnRTZXR0aW5ncy52YWx1ZSgpOwogfQogCitJbnRTaXplIE1v Y2tSZWFsdGltZVZpZGVvU291cmNlOjpjYXB0dXJlU2l6ZSgpIGNvbnN0Cit7CisgICAgcmV0dXJu IG1fcHJlc2V0ID8gbV9wcmVzZXQtPnNpemUgOiB0aGlzLT5zaXplKCk7Cit9CisKIHZvaWQgTW9j a1JlYWx0aW1lVmlkZW9Tb3VyY2U6OnNldHRpbmdzRGlkQ2hhbmdlKE9wdGlvblNldDxSZWFsdGlt ZU1lZGlhU291cmNlU2V0dGluZ3M6OkZsYWc+IHNldHRpbmdzKQogewogICAgIG1fY3VycmVudFNl dHRpbmdzID0gc3RkOjpudWxsb3B0OwogICAgIGlmIChzZXR0aW5ncy5jb250YWluc0FueSh7IFJl YWx0aW1lTWVkaWFTb3VyY2VTZXR0aW5nczo6RmxhZzo6V2lkdGgsIFJlYWx0aW1lTWVkaWFTb3Vy Y2VTZXR0aW5nczo6RmxhZzo6SGVpZ2h0IH0pKSB7Ci0gICAgICAgIG1fYmFzZUZvbnRTaXplID0g c2l6ZSgpLmhlaWdodCgpICogLjA4OworICAgICAgICBtX2Jhc2VGb250U2l6ZSA9IGNhcHR1cmVT aXplKCkuaGVpZ2h0KCkgKiAuMDg7CiAgICAgICAgIG1fYmlwQm9wRm9udFNpemUgPSBtX2Jhc2VG b250U2l6ZSAqIDIuNTsKICAgICAgICAgbV9zdGF0c0ZvbnRTaXplID0gbV9iYXNlRm9udFNpemUg KiAuNTsKICAgICAgICAgbV9pbWFnZUJ1ZmZlciA9IG51bGxwdHI7CkBAIC0yMTgsOCArMjIzLDkg QEAgU2Vjb25kcyBNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZTo6ZWxhcHNlZFRpbWUoKQogCiB2b2lk IE1vY2tSZWFsdGltZVZpZGVvU291cmNlOjpkcmF3QW5pbWF0aW9uKEdyYXBoaWNzQ29udGV4dCYg Y29udGV4dCkKIHsKLSAgICBmbG9hdCByYWRpdXMgPSBzaXplKCkud2lkdGgoKSAqIC4wOTsKLSAg ICBGbG9hdFBvaW50IGxvY2F0aW9uKHNpemUoKS53aWR0aCgpICogLjgsIHNpemUoKS5oZWlnaHQo KSAqIC4zKTsKKyAgICBhdXRvIHNpemUgPSBjYXB0dXJlU2l6ZSgpOworICAgIGZsb2F0IHJhZGl1 cyA9IHNpemUud2lkdGgoKSAqIC4wOTsKKyAgICBGbG9hdFBvaW50IGxvY2F0aW9uKHNpemUud2lk dGgoKSAqIC44LCBzaXplLmhlaWdodCgpICogLjMpOwogCiAgICAgbV9wYXRoLmNsZWFyKCk7CiAg ICAgbV9wYXRoLm1vdmVUbyhsb2NhdGlvbik7CkBAIC0yNDgsNyArMjU0LDcgQEAgdm9pZCBNb2Nr UmVhbHRpbWVWaWRlb1NvdXJjZTo6ZHJhd0JveGVzKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCkK ICAgICBzdGF0aWMgY29uc3QgUkdCQTMyIGdyZWVuID0gMHhmZjAwODAwMDsKICAgICBzdGF0aWMg Y29uc3QgUkdCQTMyIGN5YW4gPSAweEZGMDBGRkZGOwogCi0gICAgSW50U2l6ZSBzaXplID0gdGhp cy0+c2l6ZSgpOworICAgIEludFNpemUgc2l6ZSA9IGNhcHR1cmVTaXplKCk7CiAgICAgZmxvYXQg Ym94U2l6ZSA9IHNpemUud2lkdGgoKSAqIC4wMzU7CiAgICAgZmxvYXQgYm94VG9wID0gc2l6ZS5o ZWlnaHQoKSAqIC42OwogCkBAIC0zMzAsOCArMzM2LDggQEAgdm9pZCBNb2NrUmVhbHRpbWVWaWRl b1NvdXJjZTo6ZHJhd1RleHQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0KQogICAgIEZvbnRDYXNj YWRlIHN0YXRzRm9udCB7IFdURk1vdmUoZm9udERlc2NyaXB0aW9uKSwgMCwgMCB9OwogICAgIHN0 YXRzRm9udC51cGRhdGUobnVsbHB0cik7CiAKLSAgICBJbnRTaXplIHNpemUgPSB0aGlzLT5zaXpl KCk7Ci0gICAgRmxvYXRQb2ludCB0aW1lTG9jYXRpb24oc2l6ZS53aWR0aCgpICogLjA1LCBzaXpl LmhlaWdodCgpICogLjE1KTsKKyAgICBJbnRTaXplIGNhcHR1cmVTaXplID0gdGhpcy0+Y2FwdHVy ZVNpemUoKTsKKyAgICBGbG9hdFBvaW50IHRpbWVMb2NhdGlvbihjYXB0dXJlU2l6ZS53aWR0aCgp ICogLjA1LCBjYXB0dXJlU2l6ZS5oZWlnaHQoKSAqIC4xNSk7CiAgICAgY29udGV4dC5zZXRGaWxs Q29sb3IoQ29sb3I6OndoaXRlKTsKICAgICBjb250ZXh0LnNldFRleHREcmF3aW5nTW9kZShUZXh0 TW9kZUZpbGwpOwogICAgIFN0cmluZyBzdHJpbmcgPSBTdHJpbmc6OmZvcm1hdCgiJTAydTolMDJ1 OiUwMnUuJTAzdSIsIGhvdXJzLCBtaW51dGVzLCBzZWNvbmRzLCBtaWxsaXNlY29uZHMgJSAxMDAw KTsKQEAgLTM0MSw3ICszNDcsNyBAQCB2b2lkIE1vY2tSZWFsdGltZVZpZGVvU291cmNlOjpkcmF3 VGV4dChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQpCiAgICAgdGltZUxvY2F0aW9uLm1vdmUoMCwg bV9iYXNlRm9udFNpemUpOwogICAgIGNvbnRleHQuZHJhd1RleHQodGltZUZvbnQsIFRleHRSdW4o KFN0cmluZ1ZpZXcoc3RyaW5nKSkpLCB0aW1lTG9jYXRpb24pOwogCi0gICAgRmxvYXRQb2ludCBz dGF0c0xvY2F0aW9uKHNpemUud2lkdGgoKSAqIC40NSwgc2l6ZS5oZWlnaHQoKSAqIC43NSk7Cisg ICAgRmxvYXRQb2ludCBzdGF0c0xvY2F0aW9uKGNhcHR1cmVTaXplLndpZHRoKCkgKiAuNDUsIGNh cHR1cmVTaXplLmhlaWdodCgpICogLjc1KTsKICAgICBzdHJpbmcgPSBTdHJpbmc6OmZvcm1hdCgi UmVxdWVzdGVkIGZyYW1lIHJhdGU6ICUuMWYgZnBzIiwgZnJhbWVSYXRlKCkpOwogICAgIGNvbnRl eHQuZHJhd1RleHQoc3RhdHNGb250LCBUZXh0UnVuKChTdHJpbmdWaWV3KHN0cmluZykpKSwgc3Rh dHNMb2NhdGlvbik7CiAKQEAgLTM0OSwxMCArMzU1LDE1IEBAIHZvaWQgTW9ja1JlYWx0aW1lVmlk ZW9Tb3VyY2U6OmRyYXdUZXh0KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCkKICAgICBzdHJpbmcg PSBTdHJpbmc6OmZvcm1hdCgiT2JzZXJ2ZWQgZnJhbWUgcmF0ZTogJS4xZiBmcHMiLCBvYnNlcnZl ZEZyYW1lUmF0ZSgpKTsKICAgICBjb250ZXh0LmRyYXdUZXh0KHN0YXRzRm9udCwgVGV4dFJ1bigo U3RyaW5nVmlldyhzdHJpbmcpKSksIHN0YXRzTG9jYXRpb24pOwogCisgICAgYXV0byBzaXplID0g dGhpcy0+c2l6ZSgpOwogICAgIHN0YXRzTG9jYXRpb24ubW92ZSgwLCBtX3N0YXRzRm9udFNpemUp OwogICAgIHN0cmluZyA9IFN0cmluZzo6Zm9ybWF0KCJTaXplOiAldSB4ICV1Iiwgc2l6ZS53aWR0 aCgpLCBzaXplLmhlaWdodCgpKTsKICAgICBjb250ZXh0LmRyYXdUZXh0KHN0YXRzRm9udCwgVGV4 dFJ1bigoU3RyaW5nVmlldyhzdHJpbmcpKSksIHN0YXRzTG9jYXRpb24pOwogCisgICAgc3RhdHNM b2NhdGlvbi5tb3ZlKDAsIG1fc3RhdHNGb250U2l6ZSk7CisgICAgc3RyaW5nID0gU3RyaW5nOjpm b3JtYXQoIlByZXNldCBzaXplOiAldSB4ICV1IiwgY2FwdHVyZVNpemUud2lkdGgoKSwgY2FwdHVy ZVNpemUuaGVpZ2h0KCkpOworICAgIGNvbnRleHQuZHJhd1RleHQoc3RhdHNGb250LCBUZXh0UnVu KChTdHJpbmdWaWV3KHN0cmluZykpKSwgc3RhdHNMb2NhdGlvbik7CisKICAgICBpZiAobW9ja0Nh bWVyYSgpKSB7CiAgICAgICAgIGNvbnN0IGNoYXIqIGNhbWVyYTsKICAgICAgICAgc3dpdGNoIChm YWNpbmdNb2RlKCkpIHsKQEAgLTM4MCw3ICszOTEsNyBAQCB2b2lkIE1vY2tSZWFsdGltZVZpZGVv U291cmNlOjpkcmF3VGV4dChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQpCiAgICAgICAgIGNvbnRl eHQuZHJhd1RleHQoc3RhdHNGb250LCBUZXh0UnVuIHsgbmFtZSgpIH0sIHN0YXRzTG9jYXRpb24p OwogICAgIH0KIAotICAgIEZsb2F0UG9pbnQgYmlwQm9wTG9jYXRpb24oc2l6ZS53aWR0aCgpICog LjYsIHNpemUuaGVpZ2h0KCkgKiAuNik7CisgICAgRmxvYXRQb2ludCBiaXBCb3BMb2NhdGlvbihj YXB0dXJlU2l6ZS53aWR0aCgpICogLjYsIGNhcHR1cmVTaXplLmhlaWdodCgpICogLjYpOwogICAg IHVuc2lnbmVkIGZyYW1lTW9kID0gbV9mcmFtZU51bWJlciAlIDYwOwogICAgIGlmIChmcmFtZU1v ZCA8PSAxNSkgewogICAgICAgICBjb250ZXh0LnNldEZpbGxDb2xvcihDb2xvcjo6Y3lhbik7CkBA IC00MTMsNyArNDI0LDcgQEAgdm9pZCBNb2NrUmVhbHRpbWVWaWRlb1NvdXJjZTo6Z2VuZXJhdGVG cmFtZSgpCiAgICAgR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0ID0gYnVmZmVyLT5jb250ZXh0KCk7 CiAgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKGNvbnRleHQpOwogCi0g ICAgYXV0byYgc2l6ZSA9IHRoaXMtPnNpemUoKTsKKyAgICBhdXRvIHNpemUgPSBjYXB0dXJlU2l6 ZSgpOwogICAgIEZsb2F0UmVjdCBmcmFtZVJlY3QoRmxvYXRQb2ludCgpLCBzaXplKTsKIAogICAg IGNvbnRleHQuZmlsbFJlY3QoRmxvYXRSZWN0KEZsb2F0UG9pbnQoKSwgc2l6ZSksIG1fZmlsbENv bG9yKTsKQEAgLTQzMiw3ICs0NDMsNyBAQCBJbWFnZUJ1ZmZlciogTW9ja1JlYWx0aW1lVmlkZW9T b3VyY2U6OmltYWdlQnVmZmVyKCkgY29uc3QKICAgICBpZiAobV9pbWFnZUJ1ZmZlcikKICAgICAg ICAgcmV0dXJuIG1faW1hZ2VCdWZmZXIuZ2V0KCk7CiAKLSAgICBtX2ltYWdlQnVmZmVyID0gSW1h Z2VCdWZmZXI6OmNyZWF0ZShzaXplKCksIFVuYWNjZWxlcmF0ZWQpOworICAgIG1faW1hZ2VCdWZm ZXIgPSBJbWFnZUJ1ZmZlcjo6Y3JlYXRlKGNhcHR1cmVTaXplKCksIFVuYWNjZWxlcmF0ZWQpOwog ICAgIGlmICghbV9pbWFnZUJ1ZmZlcikKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21vY2svTW9ja1JlYWx0aW1lVmlkZW9Tb3Vy Y2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21vY2svTW9ja1JlYWx0aW1lVmlkZW9Tb3Vy Y2UuaAppbmRleCBiZDNjM2U0NTE5YWY3ZTg1ZmNjYjI2OTgzOWU1ZGI2ZTg5MzBjZjVhLi4wNzVj MGVmYzI1Y2NlZjc5ZWMyODFjOGMyYTAwOWMyNzIyZjZiYjRhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tb2NrL01vY2tSZWFsdGltZVZpZGVvU291cmNlLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbW9jay9Nb2NrUmVhbHRpbWVWaWRlb1NvdXJjZS5oCkBAIC03 MCw2ICs3MCw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBpc0NhcHR1cmVTb3VyY2UoKSBjb25zdCBm aW5hbCB7IHJldHVybiB0cnVlOyB9CiAgICAgYm9vbCBzdXBwb3J0c1NpemVBbmRGcmFtZVJhdGUo c3RkOjpvcHRpb25hbDxpbnQ+IHdpZHRoLCBzdGQ6Om9wdGlvbmFsPGludD4gaGVpZ2h0LCBzdGQ6 Om9wdGlvbmFsPGRvdWJsZT4pIGZpbmFsOwogICAgIHZvaWQgc2V0U2l6ZUFuZEZyYW1lUmF0ZShz dGQ6Om9wdGlvbmFsPGludD4gd2lkdGgsIHN0ZDo6b3B0aW9uYWw8aW50PiBoZWlnaHQsIHN0ZDo6 b3B0aW9uYWw8ZG91YmxlPikgZmluYWw7CisgICAgdm9pZCBzZXRTaXplQW5kRnJhbWVSYXRlV2l0 aFByZXNldChJbnRTaXplLCBkb3VibGUsIFJlZlB0cjxWaWRlb1ByZXNldD4gcHJlc2V0KSBmaW5h bCB7IG1fcHJlc2V0ID0gcHJlc2V0OyB9CisgICAgSW50U2l6ZSBjYXB0dXJlU2l6ZSgpIGNvbnN0 OwogCiAgICAgdm9pZCBnZW5lcmF0ZVByZXNldHMoKSBmaW5hbDsKIApAQCAtMTA4LDYgKzExMCw3 IEBAIHByaXZhdGU6CiAgICAgUmVhbHRpbWVNZWRpYVNvdXJjZVN1cHBvcnRlZENvbnN0cmFpbnRz IG1fc3VwcG9ydGVkQ29uc3RyYWludHM7CiAgICAgQ29sb3IgbV9maWxsQ29sb3IgeyBDb2xvcjo6 YmxhY2sgfTsKICAgICBNb2NrTWVkaWFEZXZpY2UgbV9kZXZpY2U7CisgICAgUmVmUHRyPFZpZGVv UHJlc2V0PiBtX3ByZXNldDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBj N2UyMzg5ZWQ5ZDk4ZmI0ODRjYzFlMWU5ODJmM2M5MWQxNzAzODc5Li4wNGNhNjYxYmFmOWQ3ZjFj OGM0ZjVhYzhhNWZlNWRkZTUzZDg3MTIyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTgtMTIt MDggIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW01l ZGlhU3RyZWFtXSBTY2FsZWQgdmlkZW8gZnJhbWVzIHNob3VsZCBiZSByZXNpemVkIGluIGxldHRl cmJveCBtb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTI1MjgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ2NTc2NjM4PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9tZWRpYXN0cmVhbS9y ZXNpemUtbGV0dGVyYm94LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9tZWRp YXN0cmVhbS9yZXNpemUtbGV0dGVyYm94Lmh0bWw6IEFkZGVkLgorCiAyMDE4LTEyLTA3ICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFtNZWRpYVN0cmVh bV0gJ2RldmljZWNoYW5nZScgZXZlbnQgc2hvdWxkIG5vdCBmaXJlIGluIGZyYW1lcyB0aGF0IGNh bid0IGFjY2VzcyBjYXB0dXJlIGRldmljZXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qv bWVkaWFzdHJlYW0vcmVzaXplLWxldHRlcmJveC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9m YXN0L21lZGlhc3RyZWFtL3Jlc2l6ZS1sZXR0ZXJib3gtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LjRjMDE4NTg0YTQ5MDQ1ZjJmNjAzNWRmYjgyZTJiZTJjYzg5MTAyYmQKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL3Jlc2l6ZS1sZXR0ZXJib3gtZXhwZWN0 ZWQudHh0CkBAIC0wLDAgKzEsNCBAQAorCisKK1BBU1MgVmlkZW8gZnJhbWVzIGFyZSByZXNpemVk IGluIGxldHRlcmJveC1tb2RlIHdoZW4gY2FwdHVyZWQgYXQgbm9uLW5hdGl2ZSBzaXplLiAKKwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9yZXNpemUtbGV0dGVyYm94 Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL3Jlc2l6ZS1sZXR0ZXJib3guaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi5jNjFkMTA2NjViNDE5MjNhODVjMGYwMGIzMTg4NDM0OTNjMTQxYjM2Ci0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9yZXNpemUtbGV0 dGVyYm94Lmh0bWwKQEAgLTAsMCArMSw2NyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAg ICA8aGVhZD4KKyAgICAgICAgPHZpZGVvIGlkPSJ2aWRlbyIgYXV0b3BsYXkgd2lkdGg9NDgwcHgg aGVpZ2h0PTQ4MHB4IGNvbnRyb2xzID48L3ZpZGVvPgorICAgICAgICA8Y2FudmFzIGlkPSJjYW52 YXMiIHdpZHRoPTQ4MHB4IGhlaWdodD00ODBweD48L2NhbnZhcz4KKyAgICAgICAgPHNjcmlwdCBz cmM9Ii4uLy4uL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+CisgICAgICAgIDxz Y3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQuanMiPjwvc2NyaXB0 PgorICAgICAgICA8c2NyaXB0PgorCitjb25zdCBjYW52YXMgPSBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgiY2FudmFzIik7Citjb25zdCB2aWRlbyA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ2 aWRlbyIpOworCitmdW5jdGlvbiBpc1BpeGVsQmxhY2socGl4ZWwpCit7CisgICAgcmV0dXJuIHBp eGVsWzBdID09PSAwICYmIHBpeGVsWzFdID09PSAwICYmIHBpeGVsWzJdID09PSAwICYmIHBpeGVs WzNdID09PSAyNTU7Cit9CisKK2Z1bmN0aW9uIGlzUGl4ZWxHcmF5KHBpeGVsKQoreworICAgIHJl dHVybiBwaXhlbFswXSA9PT0gMTI4ICYmIHBpeGVsWzFdID09PSAxMjggJiYgcGl4ZWxbMl0gPT09 IDEyOCAmJiBwaXhlbFszXSA9PT0gMjU1OworfQorCitmdW5jdGlvbiBsb2dQaXhlbChuYW1lLCBw aXhlbCkKK3sKKyAgICBjb25zb2xlLmxvZyhgJHtuYW1lfTogJHtwaXhlbFswXX0sICR7cGl4ZWxb MV19LCAke3BpeGVsWzJdfSwgJHtwaXhlbFszXX1gKTsKK30KKworZnVuY3Rpb24gY2hlY2tDYW52 YXMoY2FudmFzLCBzdHJlYW0pCit7CisgICAgcmV0dXJuIG5ldyBQcm9taXNlKChyZXNvbHZlLCBy ZWplY3QpID0+IHsKKyAgICAgICAgdmlkZW8uc3JjT2JqZWN0ID0gc3RyZWFtOworICAgICAgICB2 aWRlby5vbnBsYXkgPSAoKSA9PiB7CisgICAgICAgICAgICBjb25zdCBjdHggPSBjYW52YXMuZ2V0 Q29udGV4dCgiMmQiKTsKKyAgICAgICAgICAgIGN0eC5kcmF3SW1hZ2UodmlkZW8sIDAgLDApOwor CisgICAgICAgICAgICB0cnkgeworICAgICAgICAgICAgICAgIHNldFRpbWVvdXQoKCkgPT4gewor ICAgICAgICAgICAgICAgICAgICBhc3NlcnRfdHJ1ZShpc1BpeGVsQmxhY2soY3R4LmdldEltYWdl RGF0YSg1LCA1LCAxLCAxKS5kYXRhKSwgIlBpeGVsIGF0IDV4NSBpcyBOT1QgZnJvbSBjYW1lcmEu Iik7CisgICAgICAgICAgICAgICAgICAgIGFzc2VydF90cnVlKGlzUGl4ZWxHcmF5KGN0eC5nZXRJ bWFnZURhdGEoNTAsIDIwMCwgMSwgMSkuZGF0YSksICJQaXhlbCBhdCA1MHgyMDAgaXMgZnJvbSBj YW1lcmEuIik7CisgICAgICAgICAgICAgICAgICAgIHJlc29sdmUoKTsKKyAgICAgICAgICAgICAg ICB9LCA1MDApOworICAgICAgICAgICAgfSBjYXRjaChlcnIpIHsKKyAgICAgICAgICAgICAgICBy ZWplY3QoZXJyKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisgICAg ICAgIH0KKyAgICB9KTsKK30KKworcHJvbWlzZV90ZXN0KGFzeW5jICgpID0+IHsKKyAgICBsZXQg c3RyZWFtID0gYXdhaXQgbmF2aWdhdG9yLm1lZGlhRGV2aWNlcy5nZXRVc2VyTWVkaWEoeyB2aWRl bzogdHJ1ZSB9KTsKKyAgICBzdHJlYW0gPSBudWxsOworCisgICAgY29uc3QgZGV2aWNlcyA9IGF3 YWl0IG5hdmlnYXRvci5tZWRpYURldmljZXMuZW51bWVyYXRlRGV2aWNlcygpOworICAgIGxldCBj YW1lcmFJRCA9IHVuZGVmaW5lZDsKKyAgICBkZXZpY2VzLmZvckVhY2goZGV2aWNlID0+IHsgaWYg KGRldmljZS5sYWJlbCA9PSAiTW9jayB2aWRlbyBkZXZpY2UgMiIpIGNhbWVyYUlEID0gZGV2aWNl LmRldmljZUlkOyB9KTsKKyAgICBhc3NlcnRfdHJ1ZShjYW1lcmFJRCAhPT0gdW5kZWZpbmVkLCAi Rm91bmQgY2FtZXJhMiIpOworICAgIAorICAgIHN0cmVhbSA9IGF3YWl0IG5hdmlnYXRvci5tZWRp YURldmljZXMuZ2V0VXNlck1lZGlhKHsgdmlkZW86IHsgZGV2aWNlSWQ6IHsgZXhhY3Q6IGNhbWVy YUlEIH0sIHdpZHRoOiA0ODAsIGhlaWdodDogNDgwIH0gfSk7CisgICAgCisgICAgcmV0dXJuIGNo ZWNrQ2FudmFzKGNhbnZhcywgc3RyZWFtKTsKKworfSwgIlZpZGVvIGZyYW1lcyBhcmUgcmVzaXpl ZCBpbiBsZXR0ZXJib3gtbW9kZSB3aGVuIGNhcHR1cmVkIGF0IG5vbi1uYXRpdmUgc2l6ZS4iKTsK KworICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2hlYWQ+Cis8L2h0bWw+Cg==