109326 2013-02-08 14:47:10 -0800 [skia] Fix memory management in SkiaImageFilterBuilder and friends. 2013-02-09 11:07:03 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 senorblanco senorblanco dino jamesr junov webkit.review.bot oldest_to_newest 828774 0 senorblanco 2013-02-08 14:47:10 -0800 [skia] Fix memory management in SkiaImageFilterBuilder and friends. 828779 1 187367 senorblanco 2013-02-08 14:51:53 -0800 Created attachment 187367 Patch 829085 2 187367 webkit.review.bot 2013-02-09 11:06:59 -0800 Comment on attachment 187367 Patch Clearing flags on attachment: 187367 Committed r142372: <http://trac.webkit.org/changeset/142372> 829086 3 webkit.review.bot 2013-02-09 11:07:03 -0800 All reviewed patches have been landed. Closing bug. 187367 2013-02-08 14:51:53 -0800 2013-02-09 11:06:58 -0800 Patch bug-109326-20130208174827.patch text/plain 10903 senorblanco U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyMjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDdlNDUzNjlhZjQzZTQy NDM0ZDhmYjY4NGNhYWRjODU5NmVmMmU3MS4uMzA3NGM5ODUyMWJkYjc4NmQ2ZjQ3MTE5YWEzNmFl M2I5YzlhZDUxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEzLTAyLTA4ICBTdGVw aGVuIFdoaXRlICA8c2Vub3JibGFuY29AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtza2lhXSBG aXggbWVtb3J5IG1hbmFnZW1lbnQgaW4gU2tpYUltYWdlRmlsdGVyQnVpbGRlciBhbmQgZnJpZW5k cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTMy NgorCisgICAgICAgIFNhZGx5LCBza2lhIGhhcyBubyBvZmZpY2lhbCByZWYtY291bnRlZCBwb2lu dGVycywgc28gd2UgbXVzdCBtYWtlIGRvCisgICAgICAgIHdpdGggU2tBdXRvVFVucmVmLgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvcnJlY3RuZXNz IGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMgaW4gY3NzMy9maWx0ZXJzLgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9za2lhL0ZFQmxlbmRTa2lhLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkZFQmxlbmQ6OmNyZWF0ZUltYWdlRmlsdGVyKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9maWx0ZXJzL3NraWEvRkVDb21wb25lbnRUcmFuc2ZlclNraWEuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RkVDb21wb25lbnRUcmFuc2Zlcjo6Y3JlYXRlSW1hZ2VGaWx0ZXIpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvc2tpYS9GRUxpZ2h0aW5nU2tpYS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpGRUxpZ2h0aW5nOjpjcmVhdGVJbWFnZUZpbHRlcik6Cisg ICAgICAgIEFkb3B0IHJlZnMgcHJvZHVjZWQgYnkgdGhlIGJ1aWxkKCkgcGFzcyB3aXRoIFNrQXV0 b1RVbnJlZi4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL3NraWEvU2tpYUlt YWdlRmlsdGVyQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTa2lhSW1hZ2VGaWx0ZXJC dWlsZGVyOjp+U2tpYUltYWdlRmlsdGVyQnVpbGRlcik6CisgICAgICAgIFVucmVmIHRoZSBidWls ZGVyJ3MgaGFzaG1hcCBlZmZlY3QgcG9pbnRlcnMuCisgICAgICAgIChXZWJDb3JlOjpTa2lhSW1h Z2VGaWx0ZXJCdWlsZGVyOjpidWlsZCk6CisgICAgICAgIFJlZiB0aGUgcG9pbnRlciByZXR1cm5l ZCB0byB0aGUgY2FsbGVyLCBhbmQgdXNlIFNrQXV0b1RVbnJlZgorICAgICAgICBpbnRlcm5hbGx5 IHdoaWxlIGJ1aWxkaW5nIHRoZSB0cmVlLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Zp bHRlcnMvc2tpYS9Ta2lhSW1hZ2VGaWx0ZXJCdWlsZGVyLmg6CisgICAgICAgIChTa2lhSW1hZ2VG aWx0ZXJCdWlsZGVyKToKKyAgICAgICAgQWRkIGEgZGVzdHJ1Y3RvciB0byBTa2lhSW1hZ2VGaWx0 ZXJCdWlsZGVyLgorCisKIDIwMTMtMDItMDggIEhhcmFsZCBBbHZlc3RyYW5kICA8aHRhQGdvb2ds ZS5jb20+CiAKICAgICAgICAgRml4IGFuZCB0ZXN0IGZvciBtaXNzaW5nIHJldHVybiBzdGF0ZW1l bnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMv c2tpYS9GRUJsZW5kU2tpYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9m aWx0ZXJzL3NraWEvRkVCbGVuZFNraWEuY3BwCmluZGV4IGNkZGEyY2I1ZTExNzdkNjhlNjJjZTgw Yzc2MGQ1NTM2ZGM2MWE4MDEuLjY0ZTUzNThhMzIzMWU4OWZjYTZjYzdlMjM3ZWNkZjRlMDU5MzJj YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMv c2tpYS9GRUJsZW5kU2tpYS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZmlsdGVycy9za2lhL0ZFQmxlbmRTa2lhLmNwcApAQCAtOTIsOCArOTIsOCBAQCBib29sIEZF QmxlbmQ6OnBsYXRmb3JtQXBwbHlTa2lhKCkKIAogU2tJbWFnZUZpbHRlciogRkVCbGVuZDo6Y3Jl YXRlSW1hZ2VGaWx0ZXIoU2tpYUltYWdlRmlsdGVyQnVpbGRlciogYnVpbGRlcikKIHsKLSAgICBT a0ltYWdlRmlsdGVyKiBmb3JlZ3JvdW5kID0gYnVpbGRlci0+YnVpbGQoaW5wdXRFZmZlY3QoMCkp OwotICAgIFNrSW1hZ2VGaWx0ZXIqIGJhY2tncm91bmQgPSBidWlsZGVyLT5idWlsZChpbnB1dEVm ZmVjdCgxKSk7CisgICAgU2tBdXRvVFVucmVmPFNrSW1hZ2VGaWx0ZXI+IGZvcmVncm91bmQoYnVp bGRlci0+YnVpbGQoaW5wdXRFZmZlY3QoMCkpKTsKKyAgICBTa0F1dG9UVW5yZWY8U2tJbWFnZUZp bHRlcj4gYmFja2dyb3VuZChidWlsZGVyLT5idWlsZChpbnB1dEVmZmVjdCgxKSkpOwogICAgIFNr QmxlbmRJbWFnZUZpbHRlcjo6TW9kZSBtb2RlID0gdG9Ta2lhTW9kZShtX21vZGUpOwogICAgIHJl dHVybiBuZXcgU2tCbGVuZEltYWdlRmlsdGVyKG1vZGUsIGJhY2tncm91bmQsIGZvcmVncm91bmQp OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVy cy9za2lhL0ZFQ29tcG9uZW50VHJhbnNmZXJTa2lhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2ZpbHRlcnMvc2tpYS9GRUNvbXBvbmVudFRyYW5zZmVyU2tpYS5jcHAKaW5k ZXggMjYwOTU0YzQxNzExZDllNjMyMGU2ZWIzNTkxN2Y4MzYzMjdkYjQ3My4uYjBmODBjZThiNDRi ZWM4YTVkMmQzYjY1NjRkYWJkOTllZGZjMTFiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9za2lhL0ZFQ29tcG9uZW50VHJhbnNmZXJTa2lhLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL3NraWEvRkVD b21wb25lbnRUcmFuc2ZlclNraWEuY3BwCkBAIC02MCw3ICs2MCw3IEBAIGJvb2wgRkVDb21wb25l bnRUcmFuc2Zlcjo6cGxhdGZvcm1BcHBseVNraWEoKQogCiBTa0ltYWdlRmlsdGVyKiBGRUNvbXBv bmVudFRyYW5zZmVyOjpjcmVhdGVJbWFnZUZpbHRlcihTa2lhSW1hZ2VGaWx0ZXJCdWlsZGVyKiBi dWlsZGVyKQogewotICAgIFNrSW1hZ2VGaWx0ZXIqIGlucHV0ID0gYnVpbGRlci0+YnVpbGQoaW5w dXRFZmZlY3QoMCkpOworICAgIFNrQXV0b1RVbnJlZjxTa0ltYWdlRmlsdGVyPiBpbnB1dChidWls ZGVyLT5idWlsZChpbnB1dEVmZmVjdCgwKSkpOwogCiAgICAgdW5zaWduZWQgY2hhciByVmFsdWVz WzI1Nl0sIGdWYWx1ZXNbMjU2XSwgYlZhbHVlc1syNTZdLCBhVmFsdWVzWzI1Nl07CiAgICAgZ2V0 VmFsdWVzKHJWYWx1ZXMsIGdWYWx1ZXMsIGJWYWx1ZXMsIGFWYWx1ZXMpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9za2lhL0ZFTGlnaHRpbmdT a2lhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvc2tpYS9G RUxpZ2h0aW5nU2tpYS5jcHAKaW5kZXggOWY0YzZiOTFlM2VlN2M3NTUwM2UzYzVmMDc1OGI2NWUy YjU1YTZmNS4uZDcwODdkNDAxMjI4YjRiNTI4NDcxOTE5MDc1YmYzMjdjMjNkMDZiYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9za2lhL0ZFTGln aHRpbmdTa2lhLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0 ZXJzL3NraWEvRkVMaWdodGluZ1NraWEuY3BwCkBAIC0zOCw3ICszOCw3IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAogU2tJbWFnZUZpbHRlciogRkVMaWdodGluZzo6Y3JlYXRlSW1hZ2VGaWx0ZXIo U2tpYUltYWdlRmlsdGVyQnVpbGRlciogYnVpbGRlcikKIHsKLSAgICBTa0ltYWdlRmlsdGVyKiBp bnB1dCA9IGJ1aWxkZXIgPyBidWlsZGVyLT5idWlsZChpbnB1dEVmZmVjdCgwKSkgOiAwOworICAg IFNrQXV0b1RVbnJlZjxTa0ltYWdlRmlsdGVyPiBpbnB1dChidWlsZGVyID8gYnVpbGRlci0+YnVp bGQoaW5wdXRFZmZlY3QoMCkpIDogMCk7CiAgICAgc3dpdGNoIChtX2xpZ2h0U291cmNlLT50eXBl KCkpIHsKICAgICBjYXNlIExTX0RJU1RBTlQ6IHsKICAgICAgICAgRGlzdGFudExpZ2h0U291cmNl KiBkaXN0YW50TGlnaHRTb3VyY2UgPSBzdGF0aWNfY2FzdDxEaXN0YW50TGlnaHRTb3VyY2UqPiht X2xpZ2h0U291cmNlLmdldCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2ZpbHRlcnMvc2tpYS9Ta2lhSW1hZ2VGaWx0ZXJCdWlsZGVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvc2tpYS9Ta2lhSW1hZ2VGaWx0ZXJC dWlsZGVyLmNwcAppbmRleCA4ZmY0YTMxYzJhZDhjMTJiNmE1M2U2ZGYxODA2Mzg3NjU3NGE4MWI1 Li44OTc1ZGIxYzRkZmY0NDE3OGI3MDRmOWE4ZDJkNjU0NjJkYmY1ZmYxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL3NraWEvU2tpYUltYWdlRmls dGVyQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmls dGVycy9za2lhL1NraWFJbWFnZUZpbHRlckJ1aWxkZXIuY3BwCkBAIC0xNjUsMjMgKzE2NSwzMSBA QCBTa2lhSW1hZ2VGaWx0ZXJCdWlsZGVyOjpTa2lhSW1hZ2VGaWx0ZXJCdWlsZGVyKCkKIHsKIH0K IAorU2tpYUltYWdlRmlsdGVyQnVpbGRlcjo6flNraWFJbWFnZUZpbHRlckJ1aWxkZXIoKQorewor ICAgIGZvciAoRmlsdGVyQnVpbGRlckhhc2hNYXA6Oml0ZXJhdG9yIGl0ID0gbV9tYXAuYmVnaW4o KTsgaXQgIT0gbV9tYXAuZW5kKCk7ICsraXQpCisgICAgICAgIFNrU2FmZVVucmVmKGl0LT52YWx1 ZSk7Cit9CisKIFNrSW1hZ2VGaWx0ZXIqIFNraWFJbWFnZUZpbHRlckJ1aWxkZXI6OmJ1aWxkKEZp bHRlckVmZmVjdCogZWZmZWN0KQogewogICAgIGlmICghZWZmZWN0KQogICAgICAgICByZXR1cm4g MDsKIAorICAgIFNrSW1hZ2VGaWx0ZXIqIGZpbHRlciA9IDA7CiAgICAgRmlsdGVyQnVpbGRlckhh c2hNYXA6Oml0ZXJhdG9yIGl0ID0gbV9tYXAuZmluZChlZmZlY3QpOwogICAgIGlmIChpdCAhPSBt X21hcC5lbmQoKSkKLSAgICAgICAgcmV0dXJuIGl0LT52YWx1ZTsKLQotICAgIFNrSW1hZ2VGaWx0 ZXIqIGZpbHRlciA9IGVmZmVjdC0+Y3JlYXRlSW1hZ2VGaWx0ZXIodGhpcyk7Ci0gICAgbV9tYXAu c2V0KGVmZmVjdCwgZmlsdGVyKTsKKyAgICAgICAgZmlsdGVyID0gaXQtPnZhbHVlOworICAgIGVs c2UgaWYgKChmaWx0ZXIgPSBlZmZlY3QtPmNyZWF0ZUltYWdlRmlsdGVyKHRoaXMpKSkKKyAgICAg ICAgbV9tYXAuc2V0KGVmZmVjdCwgZmlsdGVyKTsKKyAgICAvLyBUaGUgaGFzaCBtYXAgaGFzIGEg cmVmLCBzbyB3ZSByZXR1cm4gYSBuZXcgcmVmIGZvciB0aGUgY2FsbGVyLgorICAgIFNrU2FmZVJl ZihmaWx0ZXIpOwogICAgIHJldHVybiBmaWx0ZXI7CiB9CiAKIFNrSW1hZ2VGaWx0ZXIqIFNraWFJ bWFnZUZpbHRlckJ1aWxkZXI6OmJ1aWxkKGNvbnN0IEZpbHRlck9wZXJhdGlvbnMmIG9wZXJhdGlv bnMpCiB7Ci0gICAgU2tJbWFnZUZpbHRlciogZmlsdGVyID0gMDsKKyAgICBTa0F1dG9UVW5yZWY8 U2tJbWFnZUZpbHRlcj4gZmlsdGVyOwogICAgIFNrU2NhbGFyIG1hdHJpeFsyMF07CiAgICAgZm9y IChzaXplX3QgaSA9IDA7IGkgPCBvcGVyYXRpb25zLnNpemUoKTsgKytpKSB7CiAgICAgICAgIGNv bnN0IEZpbHRlck9wZXJhdGlvbiYgb3AgPSAqb3BlcmF0aW9ucy5hdChpKTsKQEAgLTE4OSw2NSAr MTk3LDY1IEBAIFNrSW1hZ2VGaWx0ZXIqIFNraWFJbWFnZUZpbHRlckJ1aWxkZXI6OmJ1aWxkKGNv bnN0IEZpbHRlck9wZXJhdGlvbnMmIG9wZXJhdGlvbnMpCiAgICAgICAgIGNhc2UgRmlsdGVyT3Bl cmF0aW9uOjpSRUZFUkVOQ0U6IHsKICAgICAgICAgICAgIEZpbHRlckVmZmVjdCogZmlsdGVyRWZm ZWN0ID0gc3RhdGljX2Nhc3Q8Y29uc3QgUmVmZXJlbmNlRmlsdGVyT3BlcmF0aW9uKj4oJm9wKS0+ ZmlsdGVyRWZmZWN0KCk7CiAgICAgICAgICAgICAvLyBGSVhNRTogaG9vayB1cCBwYXJlbnQgZmls dGVyIHRvIGltYWdlIHNvdXJjZQotICAgICAgICAgICAgZmlsdGVyID0gU2tpYUltYWdlRmlsdGVy QnVpbGRlcjo6YnVpbGQoZmlsdGVyRWZmZWN0KTsKKyAgICAgICAgICAgIGZpbHRlci5yZXNldChT a2lhSW1hZ2VGaWx0ZXJCdWlsZGVyOjpidWlsZChmaWx0ZXJFZmZlY3QpKTsKICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICB9CiAgICAgICAgIGNhc2UgRmlsdGVyT3BlcmF0aW9uOjpHUkFZU0NB TEU6IHsKICAgICAgICAgICAgIGZsb2F0IGFtb3VudCA9IHN0YXRpY19jYXN0PGNvbnN0IEJhc2lj Q29sb3JNYXRyaXhGaWx0ZXJPcGVyYXRpb24qPigmb3ApLT5hbW91bnQoKTsKICAgICAgICAgICAg IGdldEdyYXlzY2FsZU1hdHJpeCgxIC0gYW1vdW50LCBtYXRyaXgpOwotICAgICAgICAgICAgZmls dGVyID0gY3JlYXRlTWF0cml4SW1hZ2VGaWx0ZXIobWF0cml4LCBmaWx0ZXIpOworICAgICAgICAg ICAgZmlsdGVyLnJlc2V0KGNyZWF0ZU1hdHJpeEltYWdlRmlsdGVyKG1hdHJpeCwgZmlsdGVyKSk7 CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBjYXNlIEZpbHRlck9wZXJh dGlvbjo6U0VQSUE6IHsKICAgICAgICAgICAgIGZsb2F0IGFtb3VudCA9IHN0YXRpY19jYXN0PGNv bnN0IEJhc2ljQ29sb3JNYXRyaXhGaWx0ZXJPcGVyYXRpb24qPigmb3ApLT5hbW91bnQoKTsKICAg ICAgICAgICAgIGdldFNlcGlhTWF0cml4KDEgLSBhbW91bnQsIG1hdHJpeCk7Ci0gICAgICAgICAg ICBmaWx0ZXIgPSBjcmVhdGVNYXRyaXhJbWFnZUZpbHRlcihtYXRyaXgsIGZpbHRlcik7CisgICAg ICAgICAgICBmaWx0ZXIucmVzZXQoY3JlYXRlTWF0cml4SW1hZ2VGaWx0ZXIobWF0cml4LCBmaWx0 ZXIpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgIGNhc2UgRmlsdGVy T3BlcmF0aW9uOjpTQVRVUkFURTogewogICAgICAgICAgICAgZmxvYXQgYW1vdW50ID0gc3RhdGlj X2Nhc3Q8Y29uc3QgQmFzaWNDb2xvck1hdHJpeEZpbHRlck9wZXJhdGlvbio+KCZvcCktPmFtb3Vu dCgpOwogICAgICAgICAgICAgZ2V0U2F0dXJhdGVNYXRyaXgoYW1vdW50LCBtYXRyaXgpOwotICAg ICAgICAgICAgZmlsdGVyID0gY3JlYXRlTWF0cml4SW1hZ2VGaWx0ZXIobWF0cml4LCBmaWx0ZXIp OworICAgICAgICAgICAgZmlsdGVyLnJlc2V0KGNyZWF0ZU1hdHJpeEltYWdlRmlsdGVyKG1hdHJp eCwgZmlsdGVyKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBjYXNl IEZpbHRlck9wZXJhdGlvbjo6SFVFX1JPVEFURTogewogICAgICAgICAgICAgZmxvYXQgYW1vdW50 ID0gc3RhdGljX2Nhc3Q8Y29uc3QgQmFzaWNDb2xvck1hdHJpeEZpbHRlck9wZXJhdGlvbio+KCZv cCktPmFtb3VudCgpOwogICAgICAgICAgICAgZ2V0SHVlUm90YXRlTWF0cml4KGFtb3VudCwgbWF0 cml4KTsKLSAgICAgICAgICAgIGZpbHRlciA9IGNyZWF0ZU1hdHJpeEltYWdlRmlsdGVyKG1hdHJp eCwgZmlsdGVyKTsKKyAgICAgICAgICAgIGZpbHRlci5yZXNldChjcmVhdGVNYXRyaXhJbWFnZUZp bHRlcihtYXRyaXgsIGZpbHRlcikpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAg ICAgICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OklOVkVSVDogewogICAgICAgICAgICAgZmxvYXQg YW1vdW50ID0gc3RhdGljX2Nhc3Q8Y29uc3QgQmFzaWNDb21wb25lbnRUcmFuc2ZlckZpbHRlck9w ZXJhdGlvbio+KCZvcCktPmFtb3VudCgpOwogICAgICAgICAgICAgZ2V0SW52ZXJ0TWF0cml4KGFt b3VudCwgbWF0cml4KTsKLSAgICAgICAgICAgIGZpbHRlciA9IGNyZWF0ZU1hdHJpeEltYWdlRmls dGVyKG1hdHJpeCwgZmlsdGVyKTsKKyAgICAgICAgICAgIGZpbHRlci5yZXNldChjcmVhdGVNYXRy aXhJbWFnZUZpbHRlcihtYXRyaXgsIGZpbHRlcikpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIH0KICAgICAgICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246Ok9QQUNJVFk6IHsKICAgICAgICAg ICAgIGZsb2F0IGFtb3VudCA9IHN0YXRpY19jYXN0PGNvbnN0IEJhc2ljQ29tcG9uZW50VHJhbnNm ZXJGaWx0ZXJPcGVyYXRpb24qPigmb3ApLT5hbW91bnQoKTsKICAgICAgICAgICAgIGdldE9wYWNp dHlNYXRyaXgoYW1vdW50LCBtYXRyaXgpOwotICAgICAgICAgICAgZmlsdGVyID0gY3JlYXRlTWF0 cml4SW1hZ2VGaWx0ZXIobWF0cml4LCBmaWx0ZXIpOworICAgICAgICAgICAgZmlsdGVyLnJlc2V0 KGNyZWF0ZU1hdHJpeEltYWdlRmlsdGVyKG1hdHJpeCwgZmlsdGVyKSk7CiAgICAgICAgICAgICBi cmVhazsKICAgICAgICAgfQogICAgICAgICBjYXNlIEZpbHRlck9wZXJhdGlvbjo6QlJJR0hUTkVT UzogewogICAgICAgICAgICAgZmxvYXQgYW1vdW50ID0gc3RhdGljX2Nhc3Q8Y29uc3QgQmFzaWND b21wb25lbnRUcmFuc2ZlckZpbHRlck9wZXJhdGlvbio+KCZvcCktPmFtb3VudCgpOwogICAgICAg ICAgICAgZ2V0QnJpZ2h0bmVzc01hdHJpeChhbW91bnQsIG1hdHJpeCk7Ci0gICAgICAgICAgICBm aWx0ZXIgPSBjcmVhdGVNYXRyaXhJbWFnZUZpbHRlcihtYXRyaXgsIGZpbHRlcik7CisgICAgICAg ICAgICBmaWx0ZXIucmVzZXQoY3JlYXRlTWF0cml4SW1hZ2VGaWx0ZXIobWF0cml4LCBmaWx0ZXIp KTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgIGNhc2UgRmlsdGVyT3Bl cmF0aW9uOjpDT05UUkFTVDogewogICAgICAgICAgICAgZmxvYXQgYW1vdW50ID0gc3RhdGljX2Nh c3Q8Y29uc3QgQmFzaWNDb21wb25lbnRUcmFuc2ZlckZpbHRlck9wZXJhdGlvbio+KCZvcCktPmFt b3VudCgpOwogICAgICAgICAgICAgZ2V0Q29udHJhc3RNYXRyaXgoYW1vdW50LCBtYXRyaXgpOwot ICAgICAgICAgICAgZmlsdGVyID0gY3JlYXRlTWF0cml4SW1hZ2VGaWx0ZXIobWF0cml4LCBmaWx0 ZXIpOworICAgICAgICAgICAgZmlsdGVyLnJlc2V0KGNyZWF0ZU1hdHJpeEltYWdlRmlsdGVyKG1h dHJpeCwgZmlsdGVyKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBj YXNlIEZpbHRlck9wZXJhdGlvbjo6QkxVUjogewogICAgICAgICAgICAgZmxvYXQgcGl4ZWxSYWRp dXMgPSBzdGF0aWNfY2FzdDxjb25zdCBCbHVyRmlsdGVyT3BlcmF0aW9uKj4oJm9wKS0+c3RkRGV2 aWF0aW9uKCkuZ2V0RmxvYXRWYWx1ZSgpOwotICAgICAgICAgICAgZmlsdGVyID0gbmV3IFNrQmx1 ckltYWdlRmlsdGVyKHBpeGVsUmFkaXVzLCBwaXhlbFJhZGl1cywgZmlsdGVyKTsKKyAgICAgICAg ICAgIGZpbHRlci5yZXNldChuZXcgU2tCbHVySW1hZ2VGaWx0ZXIocGl4ZWxSYWRpdXMsIHBpeGVs UmFkaXVzLCBmaWx0ZXIpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAg IGNhc2UgRmlsdGVyT3BlcmF0aW9uOjpEUk9QX1NIQURPVzogewogICAgICAgICAgICAgY29uc3Qg RHJvcFNoYWRvd0ZpbHRlck9wZXJhdGlvbiogZHJvcCA9IHN0YXRpY19jYXN0PGNvbnN0IERyb3BT aGFkb3dGaWx0ZXJPcGVyYXRpb24qPigmb3ApOwotICAgICAgICAgICAgZmlsdGVyID0gbmV3IERy b3BTaGFkb3dJbWFnZUZpbHRlcihTa0ludFRvU2NhbGFyKGRyb3AtPngoKSksIFNrSW50VG9TY2Fs YXIoZHJvcC0+eSgpKSwgU2tJbnRUb1NjYWxhcihkcm9wLT5zdGREZXZpYXRpb24oKSksIGRyb3At PmNvbG9yKCkucmdiKCksIGZpbHRlcik7CisgICAgICAgICAgICBmaWx0ZXIucmVzZXQobmV3IERy b3BTaGFkb3dJbWFnZUZpbHRlcihTa0ludFRvU2NhbGFyKGRyb3AtPngoKSksIFNrSW50VG9TY2Fs YXIoZHJvcC0+eSgpKSwgU2tJbnRUb1NjYWxhcihkcm9wLT5zdGREZXZpYXRpb24oKSksIGRyb3At PmNvbG9yKCkucmdiKCksIGZpbHRlcikpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0K ICNpZiBFTkFCTEUoQ1NTX1NIQURFUlMpCkBAIC0yNjAsNyArMjY4LDcgQEAgU2tJbWFnZUZpbHRl ciogU2tpYUltYWdlRmlsdGVyQnVpbGRlcjo6YnVpbGQoY29uc3QgRmlsdGVyT3BlcmF0aW9ucyYg b3BlcmF0aW9ucykKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgfQotICAgIHJl dHVybiBmaWx0ZXI7CisgICAgcmV0dXJuIGZpbHRlci5kZXRhY2goKTsKIH0KIAogfTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvc2tpYS9Ta2lh SW1hZ2VGaWx0ZXJCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9m aWx0ZXJzL3NraWEvU2tpYUltYWdlRmlsdGVyQnVpbGRlci5oCmluZGV4IDI3YmQ2ODMyMGI2YTky OWM2MTAwOTg2OGI1NzE0NmQxZGY2MjU5NDQuLjFjMWNhMjIyMGEyMTBkMWIzM2VkNzE1Y2FkNzkx MzI3OWQ5OTc2ZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2ZpbHRlcnMvc2tpYS9Ta2lhSW1hZ2VGaWx0ZXJCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9za2lhL1NraWFJbWFnZUZpbHRlckJ1aWxkZXIu aApAQCAtMzcsNiArMzcsNyBAQCBjbGFzcyBGaWx0ZXJPcGVyYXRpb25zOwogY2xhc3MgU2tpYUlt YWdlRmlsdGVyQnVpbGRlciB7CiBwdWJsaWM6CiAgICAgU2tpYUltYWdlRmlsdGVyQnVpbGRlcigp OworICAgIH5Ta2lhSW1hZ2VGaWx0ZXJCdWlsZGVyKCk7CiAKICAgICBTa0ltYWdlRmlsdGVyKiBi dWlsZChGaWx0ZXJFZmZlY3QqKTsKICAgICBTa0ltYWdlRmlsdGVyKiBidWlsZChjb25zdCBGaWx0 ZXJPcGVyYXRpb25zJik7Cg==