12103 2007-01-03 10:52:47 -0800 LEAK: Fix the leaking ImageBuffer buffers on TOT 2007-01-06 20:28:05 -0800 1 1 1 Unclassified WebKit SVG 420+ Mac OS X 10.4 RESOLVED FIXED Regression P1 Normal --- 1 eric webkit-unassigned zimmermann oldest_to_newest 37279 0 eric 2007-01-03 10:52:47 -0800 Fix the leaking ImageBuffer buffers on TOT I can't test this due to the ASSERT SVGImage/Loader regression on TOT. Someone else should land this as I'm about to get on a plane. 37270 1 12190 eric 2007-01-03 10:53:15 -0800 Created attachment 12190 the fix 37272 2 eric 2007-01-03 10:54:35 -0800 ccing WildFox. I figure he might be curious about the leak. 37267 3 12190 darin 2007-01-03 11:21:44 -0800 Comment on attachment 12190 the fix The SVGAnimateTransformElement.cpp change seems good, but unrelated. I'd prefer to keep to a minimum the number of new functions that return an object that you're obliged to delete. A good way to indicate that is to use auto_ptr<X> instead of X*. That's not so common because normally we use Shared and RefPtr. Perhaps ImageBuffer should be Shared and then we could return a PassRefPtr. No need to do the if statements in ~ImageBuffer. Both CGImageRelease and fastFree already do checks for null. The private constructor that takes ownership of a GraphicsContext should take an auto_ptr<GraphicsContext> parameter to indicate it takes ownership. Also, I'd suggest that the declaration of the private constructor not be CG_specific, even if the implementation has to be. OwnPtr is to auto_ptr as RefPtr is to PassRefPtr. r=me 37231 4 eric 2007-01-03 12:45:10 -0800 It would be best if someone else landed this (applying darin's suggestions if they so desire). 36632 5 darin 2007-01-06 20:28:05 -0800 Committed revision 18641. 12190 2007-01-03 10:53:15 -0800 2007-01-03 11:21:44 -0800 the fix leakfix.patch text/plain 9626 eric SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDE4NTQ3 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMDctMDEt MDMgIEVyaWMgU2VpZGVsICA8ZXJpY0Blc2VpZGVsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggdGhlIGxlYWtpbmcgSW1hZ2VCdWZmZXIg YnVmZmVycyBvbiBUT1QuCisKKyAgICAgICAgKiBrc3ZnMi9zdmcvU1ZHQW5pbWF0ZVRyYW5zZm9y bUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHQW5pbWF0ZVRyYW5zZm9ybUVsZW1l bnQ6OmhhbmRsZVN0YXJ0Q29uZGl0aW9uKTogcmVtb3ZlIHVudXNlZCB2YXJpYWJsZXMKKyAgICAg ICAgKiBrc3ZnMi9zdmcvU1ZHTWFza0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZH TWFza0VsZW1lbnQ6OmRyYXdNYXNrZXJDb250ZW50KToKKyAgICAgICAgKiBrc3ZnMi9zdmcvU1ZH UGF0dGVybkVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHUGF0dGVybkVsZW1lbnQ6 OmJ1aWxkUGF0dGVybik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250 ZXh0Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2VCdWZmZXIuaDoKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5jcHA6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VCdWZmZXJDRy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpJbWFnZUJ1ZmZlcjo6Y3JlYXRlSW1hZ2VCdWZmZXIpOgorICAgICAgICAoV2ViQ29yZTo6 SW1hZ2VCdWZmZXI6OkltYWdlQnVmZmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlQnVmZmVy Ojp+SW1hZ2VCdWZmZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3N2Zy9jZy9TVkdQ YWludFNlcnZlckdyYWRpZW50Q2cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHUGFpbnRTZXJ2 ZXJHcmFkaWVudDo6c2V0dXApOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3N2Zy9jZy9T VkdSZXNvdXJjZU1hc2tlckNnLm1tOgorICAgICAgICAoV2ViQ29yZTo6U1ZHUmVzb3VyY2VNYXNr ZXI6OmFwcGx5TWFzayk6CisKIDIwMDctMDEtMDMgIExhcnMgS25vbGwgPGxhcnNAdHJvbGx0ZWNo LmNvbT4KIAogICAgICAgICBGaXggdGhlIFF0IGJ1aWxkCkluZGV4OiBrc3ZnMi9zdmcvU1ZHQW5p bWF0ZVRyYW5zZm9ybUVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGtzdmcyL3N2Zy9TVkdBbmlt YXRlVHJhbnNmb3JtRWxlbWVudC5jcHAJKHJldmlzaW9uIDE4NTQ1KQorKysga3N2ZzIvc3ZnL1NW R0FuaW1hdGVUcmFuc2Zvcm1FbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjY1LDEyICsy NjUsNiBAQCBib29sIFNWR0FuaW1hdGVUcmFuc2Zvcm1FbGVtZW50OjpoYW5kbGVTCiAgICAgICAg ICAgICAKICAgICAgICAgICAgIGlmICghbV9mcm9tVHJhbnNmb3JtKQogICAgICAgICAgICAgICAg IG1fZnJvbVRyYW5zZm9ybSA9IG5ldyBTVkdUcmFuc2Zvcm0oKTsKLSAgICAgICAgICAgIAotICAg ICAgICAgICAgQWZmaW5lVHJhbnNmb3JtIGJ5TWF0cml4ID0gbV90b1RyYW5zZm9ybS0+bWF0cml4 KCk7Ci0gICAgICAgICAgICBBZmZpbmVUcmFuc2Zvcm0gZnJvbU1hdHJpeCA9IG1fZnJvbVRyYW5z Zm9ybS0+bWF0cml4KCk7Ci0gICAgICAgICAgICAKLSAgICAgICAgICAgIGJ5TWF0cml4ICo9IGZy b21NYXRyaXg7Ci0gICAgICAgICAgICAKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAg ICAgICAgIGNhc2UgVkFMVUVTX0FOSU1BVElPTjoKSW5kZXg6IGtzdmcyL3N2Zy9TVkdNYXNrRWxl bWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0ga3N2ZzIvc3ZnL1NWR01hc2tFbGVtZW50LmNwcAkocmV2 aXNpb24gMTg1NDUpCisrKyBrc3ZnMi9zdmcvU1ZHTWFza0VsZW1lbnQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xMTAsNyArMTEwLDcgQEAgSW1hZ2VCdWZmZXIqIFNWR01hc2tFbGVtZW50OjpkcmF3 TWFza2VyQwogewogICAgIEludFNpemUgc2l6ZSA9IEludFNpemUobHJvdW5kZih3aWR0aCgpLnZh bHVlKCkpLCBscm91bmRmKGhlaWdodCgpLnZhbHVlKCkpKTsKIAotICAgIEltYWdlQnVmZmVyKiBt YXNrSW1hZ2UoR3JhcGhpY3NDb250ZXh0OjpjcmVhdGVJbWFnZUJ1ZmZlcihzaXplLCBmYWxzZSkp OworICAgIEltYWdlQnVmZmVyKiBtYXNrSW1hZ2UgPSBJbWFnZUJ1ZmZlcjo6Y3JlYXRlSW1hZ2VC dWZmZXIoc2l6ZSwgZmFsc2UpOwogICAgIGlmICghbWFza0ltYWdlKQogICAgICAgICByZXR1cm4g MDsKIApJbmRleDoga3N2ZzIvc3ZnL1NWR1BhdHRlcm5FbGVtZW50LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBrc3ZnMi9zdmcvU1ZHUGF0dGVybkVsZW1lbnQuY3BwCShyZXZpc2lvbiAxODU0NSkKKysrIGtz dmcyL3N2Zy9TVkdQYXR0ZXJuRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0NCw3ICsx NDQsNyBAQCB2b2lkIFNWR1BhdHRlcm5FbGVtZW50OjpidWlsZFBhdHRlcm4oY29uCiAgICAgaWYg KGhlaWdodFZhbHVlID4gdGFyZ2V0UmVjdC5oZWlnaHQoKSkKICAgICAgICAgaGVpZ2h0VmFsdWUg PSB0YXJnZXRSZWN0LmhlaWdodCgpOwogCi0gICAgSW1hZ2VCdWZmZXIqIHBhdHRlcm5JbWFnZSA9 IEdyYXBoaWNzQ29udGV4dDo6Y3JlYXRlSW1hZ2VCdWZmZXIoSW50U2l6ZShscm91bmRmKHdpZHRo VmFsdWUpLCBscm91bmRmKGhlaWdodFZhbHVlKSksIGZhbHNlKTsKKyAgICBJbWFnZUJ1ZmZlciog cGF0dGVybkltYWdlID0gSW1hZ2VCdWZmZXI6OmNyZWF0ZUltYWdlQnVmZmVyKEludFNpemUobHJv dW5kZih3aWR0aFZhbHVlKSwgbHJvdW5kZihoZWlnaHRWYWx1ZSkpLCBmYWxzZSk7CiAgICAgaWYg KCFwYXR0ZXJuSW1hZ2UpCiAgICAgICAgIHJldHVybjsKIApJbmRleDogcGxhdGZvcm0vZ3JhcGhp Y3MvR3JhcGhpY3NDb250ZXh0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcGxhdGZvcm0vZ3JhcGhpY3MvR3Jh cGhpY3NDb250ZXh0LmgJKHJldmlzaW9uIDE4NTQ1KQorKysgcGxhdGZvcm0vZ3JhcGhpY3MvR3Jh cGhpY3NDb250ZXh0LmgJKHdvcmtpbmcgY29weSkKQEAgLTE5OCw4ICsxOTgsNiBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAgICAgICAgIFBsYXRmb3JtUGF0aCogY3VycmVudFBhdGgoKTsKICNlbmRp ZgogCi0gICAgICAgIHN0YXRpYyBJbWFnZUJ1ZmZlciogY3JlYXRlSW1hZ2VCdWZmZXIoY29uc3Qg SW50U2l6ZSYsIGJvb2wgZ3JheVNjYWxlKTsKLQogICAgIHByaXZhdGU6CiAgICAgICAgIHZvaWQg c2F2ZVBsYXRmb3JtU3RhdGUoKTsKICAgICAgICAgdm9pZCByZXN0b3JlUGxhdGZvcm1TdGF0ZSgp OwpJbmRleDogcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2VCdWZmZXIuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBw bGF0Zm9ybS9ncmFwaGljcy9JbWFnZUJ1ZmZlci5oCShyZXZpc2lvbiAxODU0NSkKKysrIHBsYXRm b3JtL2dyYXBoaWNzL0ltYWdlQnVmZmVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTM4LDI2ICszOCwz MSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgY2xhc3MgR3JhcGhpY3NDb250ZXh0OwogICAg IGNsYXNzIFJlbmRlck9iamVjdDsKIAotICAgIGNsYXNzIEltYWdlQnVmZmVyIHsKKyAgICBjbGFz cyBJbWFnZUJ1ZmZlciA6IE5vbmNvcHlhYmxlIHsKICAgICBwdWJsaWM6Ci0gICAgICAgIEltYWdl QnVmZmVyKGNvbnN0IEludFNpemUmLCBHcmFwaGljc0NvbnRleHQqKTsKKyAgICAgICAgc3RhdGlj IEltYWdlQnVmZmVyKiBjcmVhdGVJbWFnZUJ1ZmZlcihjb25zdCBJbnRTaXplJiwgYm9vbCBncmF5 U2NhbGUpOworICAgICAgICAKICAgICAgICAgfkltYWdlQnVmZmVyKCk7CiAKICAgICAgICAgSW50 U2l6ZSBzaXplKCkgY29uc3Q7CiAgICAgICAgIEdyYXBoaWNzQ29udGV4dCogY29udGV4dCgpIGNv bnN0OwogCiAgICAgICAgIC8vIFRoaXMgb2ZmZXJzIGEgd2F5IHRvIHJlbmRlciBwYXJ0cyBvZiBh IFdlYktpdCByZW5kZXJpbmcgdHJlZSBpbnRvIHRoaXMgSW1hZ2VCdWZmZXIgY2xhc3MuCi0gICAg ICAgIHN0YXRpYyB2b2lkIHJlbmRlclN1YnRyZWVUb0ltYWdlKEltYWdlQnVmZmVyKiwgUmVuZGVy T2JqZWN0KiBpdGVtKTsKKyAgICAgICAgc3RhdGljIHZvaWQgcmVuZGVyU3VidHJlZVRvSW1hZ2Uo SW1hZ2VCdWZmZXIqLCBSZW5kZXJPYmplY3QqKTsKIAogI2lmIFBMQVRGT1JNKENHKQogICAgICAg ICBDR0ltYWdlUmVmIGNnSW1hZ2UoKSBjb25zdDsKICNlbmRpZgogCiAgICAgcHJpdmF0ZToKKyAg ICAgICAgdm9pZCogbV9kYXRhOworICAgICAgICBJbnRTaXplIG1fc2l6ZTsKKyAgICAgICAgYm9v bCBtX2lzR3JheVNjYWxlOworCiAgICAgICAgIE93blB0cjxHcmFwaGljc0NvbnRleHQ+IG1fY29u dGV4dDsKIAotI2lmIFBMQVRGT1JNKENHKSAKLSAgICAgICAgSW50U2l6ZSBtX3NpemU7CisjaWYg UExBVEZPUk0oQ0cpCisgICAgICAgIEltYWdlQnVmZmVyKHZvaWQqIGltYWdlRGF0YSwgY29uc3Qg SW50U2l6ZSYsIGJvb2wgZ3JheVNjYWxlLCBHcmFwaGljc0NvbnRleHQqKTsKICAgICAgICAgbXV0 YWJsZSBDR0ltYWdlUmVmIG1fY2dJbWFnZTsKICNlbmRpZgogICAgIH07CkluZGV4OiBwbGF0Zm9y bS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcGxhdGZv cm0vZ3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwCShyZXZpc2lvbiAxODU0NSkKKysr IHBsYXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dENHLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNzcyLDI3ICs3NzIsNiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6c2V0VVJMRm9yUmVj dChjb25zCiAgICAgfQogfQogCi1JbWFnZUJ1ZmZlciogR3JhcGhpY3NDb250ZXh0OjpjcmVhdGVJ bWFnZUJ1ZmZlcihjb25zdCBJbnRTaXplJiBzaXplLCBib29sIGdyYXlTY2FsZSkKLXsKLSAgICB1 bnNpZ25lZCBpbnQgYnl0ZXNQZXJSb3cgPSBzaXplLndpZHRoKCk7Ci0gICAgaWYgKCFncmF5U2Nh bGUpCi0gICAgICAgIGJ5dGVzUGVyUm93ICo9IDQ7Ci0KLSAgICB2b2lkKiBpbWFnZUJ1ZmZlciA9 IGZhc3RNYWxsb2MoYnl0ZXNQZXJSb3cgKiBzaXplLmhlaWdodCgpKTsKLSAgICBpZiAoIWltYWdl QnVmZmVyKQotICAgICAgICByZXR1cm4gMDsKLSAgICBtZW1zZXQoaW1hZ2VCdWZmZXIsIDAsIGJ5 dGVzUGVyUm93ICogc2l6ZS5oZWlnaHQoKSk7Ci0KLSAgICBDR0NvbG9yU3BhY2VSZWYgY29sb3JT cGFjZSA9IGdyYXlTY2FsZSA/IENHQ29sb3JTcGFjZUNyZWF0ZURldmljZUdyYXkoKSA6IENHQ29s b3JTcGFjZUNyZWF0ZURldmljZVJHQigpOwotICAgIENHQ29udGV4dFJlZiBjb250ZXh0ID0gQ0dC aXRtYXBDb250ZXh0Q3JlYXRlKGltYWdlQnVmZmVyLCBzaXplLndpZHRoKCksIHNpemUuaGVpZ2h0 KCksIDgsIGJ5dGVzUGVyUm93LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbG9yU3BhY2UsIGdyYXlTY2FsZSA/IGtDR0ltYWdlQWxwaGFOb25lIDog a0NHSW1hZ2VBbHBoYVByZW11bHRpcGxpZWRMYXN0KTsKLQotICAgIENHQ29sb3JTcGFjZVJlbGVh c2UoY29sb3JTcGFjZSk7Ci0gICAgR3JhcGhpY3NDb250ZXh0ICpncmFwaGljc0NvbnRleHQgPSBu ZXcgR3JhcGhpY3NDb250ZXh0KGNvbnRleHQpOwotICAgIENHQ29udGV4dFJlbGVhc2UoY29udGV4 dCk7Ci0gICAgcmV0dXJuIG5ldyBJbWFnZUJ1ZmZlcihzaXplLCBncmFwaGljc0NvbnRleHQpOwot fQotCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6c2V0UGxhdGZvcm1UZXh0RHJhd2luZ01vZGUoaW50 IG1vZGUpCiB7CiAgICAgaWYgKHBhaW50aW5nRGlzYWJsZWQoKSkKSW5kZXg6IHBsYXRmb3JtL2dy YXBoaWNzL2NnL0ltYWdlQnVmZmVyQ0cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHBsYXRmb3JtL2dyYXBo aWNzL2NnL0ltYWdlQnVmZmVyQ0cuY3BwCShyZXZpc2lvbiAxODU0NSkKKysrIHBsYXRmb3JtL2dy YXBoaWNzL2NnL0ltYWdlQnVmZmVyQ0cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw5ICszMywz NCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLUltYWdlQnVmZmVyOjpJbWFnZUJ1ZmZlcihj b25zdCBJbnRTaXplJiBzaXplLCBHcmFwaGljc0NvbnRleHQqIGNvbnRleHQpCi0gICAgOiBtX2Nv bnRleHQoY29udGV4dCkKK0ltYWdlQnVmZmVyKiBJbWFnZUJ1ZmZlcjo6Y3JlYXRlSW1hZ2VCdWZm ZXIoY29uc3QgSW50U2l6ZSYgc2l6ZSwgYm9vbCBncmF5U2NhbGUpCit7CisgICAgdW5zaWduZWQg aW50IGJ5dGVzUGVyUm93ID0gc2l6ZS53aWR0aCgpOworICAgIGlmICghZ3JheVNjYWxlKQorICAg ICAgICBieXRlc1BlclJvdyAqPSA0OworICAgIAorICAgIHZvaWQqIGltYWdlQnVmZmVyID0gZmFz dENhbGxvYyhzaXplLmhlaWdodCgpLCBieXRlc1BlclJvdyk7CisgICAgaWYgKCFpbWFnZUJ1ZmZl cikKKyAgICAgICAgcmV0dXJuIDA7CisgICAgCisgICAgQ0dDb2xvclNwYWNlUmVmIGNvbG9yU3Bh Y2UgPSBncmF5U2NhbGUgPyBDR0NvbG9yU3BhY2VDcmVhdGVEZXZpY2VHcmF5KCkgOiBDR0NvbG9y U3BhY2VDcmVhdGVEZXZpY2VSR0IoKTsKKyAgICBDR0NvbnRleHRSZWYgY2dDb250ZXh0ID0gQ0dC aXRtYXBDb250ZXh0Q3JlYXRlKGltYWdlQnVmZmVyLCBzaXplLndpZHRoKCksIHNpemUuaGVpZ2h0 KCksIDgsIGJ5dGVzUGVyUm93LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbG9yU3BhY2UsIGdyYXlTY2FsZSA/IGtDR0ltYWdlQWxwaGFOb25lIDog a0NHSW1hZ2VBbHBoYVByZW11bHRpcGxpZWRMYXN0KTsKKyAgICBDR0NvbG9yU3BhY2VSZWxlYXNl KGNvbG9yU3BhY2UpOworICAgIGlmICghY2dDb250ZXh0KQorICAgICAgICByZXR1cm4gMDsKKyAg ICBHcmFwaGljc0NvbnRleHQqIGNvbnRleHQgPSBuZXcgR3JhcGhpY3NDb250ZXh0KGNnQ29udGV4 dCk7CisgICAgQ0dDb250ZXh0UmVsZWFzZShjZ0NvbnRleHQpOworICAgIAorICAgIHJldHVybiBu ZXcgSW1hZ2VCdWZmZXIoaW1hZ2VCdWZmZXIsIHNpemUsIGdyYXlTY2FsZSwgY29udGV4dCk7Cit9 CisKKworSW1hZ2VCdWZmZXI6OkltYWdlQnVmZmVyKHZvaWQqIGltYWdlRGF0YSwgY29uc3QgSW50 U2l6ZSYgc2l6ZSwgYm9vbCBncmF5U2NhbGUsIEdyYXBoaWNzQ29udGV4dCogY29udGV4dCkKKyAg ICA6IG1fZGF0YShpbWFnZURhdGEpCiAgICAgLCBtX3NpemUoc2l6ZSkKKyAgICAsIG1faXNHcmF5 U2NhbGUoZ3JheVNjYWxlKQorICAgICwgbV9jb250ZXh0KGNvbnRleHQpCiAgICAgLCBtX2NnSW1h Z2UoMCkKIHsKIH0KQEAgLTQ0LDYgKzY5LDggQEAgSW1hZ2VCdWZmZXI6On5JbWFnZUJ1ZmZlcigp CiB7CiAgICAgaWYgKG1fY2dJbWFnZSkKICAgICAgICAgQ0dJbWFnZVJlbGVhc2UobV9jZ0ltYWdl KTsKKyAgICBpZiAobV9kYXRhKQorICAgICAgICBmYXN0RnJlZShtX2RhdGEpOwogfQogCiBJbnRT aXplIEltYWdlQnVmZmVyOjpzaXplKCkgY29uc3QKSW5kZXg6IHBsYXRmb3JtL2dyYXBoaWNzL3N2 Zy9jZy9TVkdQYWludFNlcnZlckdyYWRpZW50Q2cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHBsYXRmb3Jt L2dyYXBoaWNzL3N2Zy9jZy9TVkdQYWludFNlcnZlckdyYWRpZW50Q2cuY3BwCShyZXZpc2lvbiAx ODU0NSkKKysrIHBsYXRmb3JtL2dyYXBoaWNzL3N2Zy9jZy9TVkdQYWludFNlcnZlckdyYWRpZW50 Q2cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNzIsNyArMjcyLDcgQEAgYm9vbCBTVkdQYWludFNl cnZlckdyYWRpZW50OjpzZXR1cChHcmFwaAogICAgICAgICAgICAgSW50UmVjdCBtYXNrUmVjdCA9 IGNvbnN0X2Nhc3Q8UmVuZGVyT2JqZWN0Kj4ob2JqZWN0KS0+YWJzb2x1dGVCb3VuZGluZ0JveFJl Y3QoKTsKICAgICAgICAgICAgIG1hc2tSZWN0ID0gb2JqZWN0LT5hYnNvbHV0ZVRyYW5zZm9ybSgp LmludmVyc2UoKS5tYXBSZWN0KG1hc2tSZWN0KTsKIAotICAgICAgICAgICAgSW1hZ2VCdWZmZXIq IG1hc2tJbWFnZSA9IEdyYXBoaWNzQ29udGV4dDo6Y3JlYXRlSW1hZ2VCdWZmZXIoSW50U2l6ZSht YXNrUmVjdC53aWR0aCgpLCBtYXNrUmVjdC5oZWlnaHQoKSksIGZhbHNlKTsKKyAgICAgICAgICAg IEltYWdlQnVmZmVyKiBtYXNrSW1hZ2UgPSBJbWFnZUJ1ZmZlcjo6Y3JlYXRlSW1hZ2VCdWZmZXIo SW50U2l6ZShtYXNrUmVjdC53aWR0aCgpLCBtYXNrUmVjdC5oZWlnaHQoKSksIGZhbHNlKTsKICAg ICAgICAgICAgIC8vIEZJWE1FOiBtYXNrSW1hZ2UgY291bGQgYmUgTlVMTAogCiAgICAgICAgICAg ICBHcmFwaGljc0NvbnRleHQqIG1hc2tJbWFnZUNvbnRleHQgPSBtYXNrSW1hZ2UtPmNvbnRleHQo KTsKSW5kZXg6IHBsYXRmb3JtL2dyYXBoaWNzL3N2Zy9jZy9TVkdSZXNvdXJjZU1hc2tlckNnLm1t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIHBsYXRmb3JtL2dyYXBoaWNzL3N2Zy9jZy9TVkdSZXNvdXJjZU1hc2tl ckNnLm1tCShyZXZpc2lvbiAxODU0NSkKKysrIHBsYXRmb3JtL2dyYXBoaWNzL3N2Zy9jZy9TVkdS ZXNvdXJjZU1hc2tlckNnLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xMDAsNyArMTAwLDcgQEAgdm9p ZCBTVkdSZXNvdXJjZU1hc2tlcjo6YXBwbHlNYXNrKEdyYXBoaQogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBtYXNrU2l6ZS53aWR0aCgpLCBtYXNrU2l6ZS5oZWln aHQoKSk7CiAKICAgICAvLyBDcmVhdGUgbmV3IGdyYXBoaWNzIGNvbnRleHQgaW4gZ3JheSBzY2Fs ZSBtb2RlIGZvciBpbWFnZSByZW5kZXJpbmcKLSAgICBPd25QdHI8SW1hZ2VCdWZmZXI+IGdyYXlT Y2FsZUltYWdlKEdyYXBoaWNzQ29udGV4dDo6Y3JlYXRlSW1hZ2VCdWZmZXIobWFza1NpemUsIHRy dWUpKTsKKyAgICBPd25QdHI8SW1hZ2VCdWZmZXI+IGdyYXlTY2FsZUltYWdlKEltYWdlQnVmZmVy OjpjcmVhdGVJbWFnZUJ1ZmZlcihtYXNrU2l6ZSwgdHJ1ZSkpOwogICAgIGlmICghZ3JheVNjYWxl SW1hZ2UpCiAgICAgICAgIHJldHVybjsKICAgICBDR0NvbnRleHRSZWYgZ3JheVNjYWxlQ29udGV4 dCA9IGdyYXlTY2FsZUltYWdlLT5jb250ZXh0KCktPnBsYXRmb3JtQ29udGV4dCgpOwo=