124023 2013-11-07 17:43:51 -0800 Get rid of the out-of-line memory attachment type 2013-11-07 17:52:28 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 948488 0 andersca 2013-11-07 17:43:51 -0800 Get rid of the out-of-line memory attachment type 948489 1 216347 andersca 2013-11-07 17:45:29 -0800 Created attachment 216347 Patch 948490 2 216347 kling 2013-11-07 17:47:21 -0800 Comment on attachment 216347 Patch Oh, very nice to get rid of the extra attachment type. 948491 3 andersca 2013-11-07 17:52:28 -0800 Committed r158890: <http://trac.webkit.org/changeset/158890> 216347 2013-11-07 17:45:29 -0800 2013-11-07 17:47:21 -0800 Patch bug-124023-20131107174529.patch text/plain 10266 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4ODgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjViNGZiZTY4ZjhhZTVl ODQzNWI0OTMyNTg4MWU0ZTMxMGUyMWIyOC4uNWZlZWVmNDZkNGE0ZDllNTlkOTFkNzQ1NDU4NzY5 YTYyZTIzZmM5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDEzLTExLTA3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgR2V0IHJpZCBvZiB0 aGUgb3V0LW9mLWxpbmUgbWVtb3J5IGF0dGFjaG1lbnQgdHlwZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0MDIzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UncmUgb25seSB1c2luZyBvdXQtb2YtbGlu ZSBtZW1vcnkgZm9yIHdoZW4gdGhlIG1lc3NhZ2UgYm9keSBpcyB0b28gYmlnLCBzbworICAgICAg ICBpc29sYXRlIHRoYXQgY29kZSBpbiBDb25uZWN0aW9uIGFuZCBnZXQgcmlkIG9mIHRoZSBvdXQg b2YgbGluZSBhdHRhY2htZW50IHR5cGUuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9Db3JlSVBDL0F0 dGFjaG1lbnQuY3BwOgorICAgICAgICAoQ29yZUlQQzo6QXR0YWNobWVudDo6QXR0YWNobWVudCk6 CisgICAgICAgICogUGxhdGZvcm0vQ29yZUlQQy9BdHRhY2htZW50Lmg6CisgICAgICAgIChDb3Jl SVBDOjpBdHRhY2htZW50Ojpwb3J0KToKKyAgICAgICAgKENvcmVJUEM6OkF0dGFjaG1lbnQ6OmRp c3Bvc2l0aW9uKToKKyAgICAgICAgKiBQbGF0Zm9ybS9Db3JlSVBDL21hYy9Db25uZWN0aW9uTWFj LmNwcDoKKyAgICAgICAgKENvcmVJUEM6OkNvbm5lY3Rpb246OnNlbmRPdXRnb2luZ01lc3NhZ2Up OgorICAgICAgICAoQ29yZUlQQzo6Y3JlYXRlTWVzc2FnZURlY29kZXIpOgorCisyMDEzLTExLTA3 ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgUmVtb3Zl IG1vcmUgZGVhZCBjb2RlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMjQwMTYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29y ZUlQQy9BdHRhY2htZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQXR0 YWNobWVudC5jcHAKaW5kZXggNWQxOWJhZDE3ZjE2YjBhYzgxYjBmZjgzYWE0NjgwZjg2ZmJhOTdl Ni4uMGUzNjdhNzQ5OTg3NGQ5YzdjZDI3MDBhZjllOTM4ZTA5ZTdlYzMzMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9BdHRhY2htZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0F0dGFjaG1lbnQuY3BwCkBAIC0zOSwxOCArMzks OSBAQCBBdHRhY2htZW50OjpBdHRhY2htZW50KCkKICNpZiBPUyhEQVJXSU4pCiBBdHRhY2htZW50 OjpBdHRhY2htZW50KG1hY2hfcG9ydF9uYW1lX3QgcG9ydCwgbWFjaF9tc2dfdHlwZV9uYW1lX3Qg ZGlzcG9zaXRpb24pCiAgICAgOiBtX3R5cGUoTWFjaFBvcnRUeXBlKQorICAgICwgbV9wb3J0KHBv cnQpCisgICAgLCBtX2Rpc3Bvc2l0aW9uKGRpc3Bvc2l0aW9uKQogewotICAgIG1fcG9ydC5wb3J0 ID0gcG9ydDsKLSAgICBtX3BvcnQuZGlzcG9zaXRpb24gPSBkaXNwb3NpdGlvbjsKLX0KLQotQXR0 YWNobWVudDo6QXR0YWNobWVudCh2b2lkKiBhZGRyZXNzLCBtYWNoX21zZ19zaXplX3Qgc2l6ZSwg bWFjaF9tc2dfY29weV9vcHRpb25zX3QgY29weU9wdGlvbnMsIGJvb2wgZGVhbGxvY2F0ZSkKLSAg ICA6IG1fdHlwZShNYWNoT09MTWVtb3J5VHlwZSkKLXsKLSAgICBtX29vbE1lbW9yeS5hZGRyZXNz ID0gYWRkcmVzczsKLSAgICBtX29vbE1lbW9yeS5zaXplID0gc2l6ZTsKLSAgICBtX29vbE1lbW9y eS5jb3B5T3B0aW9ucyA9IGNvcHlPcHRpb25zOwotICAgIG1fb29sTWVtb3J5LmRlYWxsb2NhdGUg PSBkZWFsbG9jYXRlOwogfQogCiB2b2lkIEF0dGFjaG1lbnQ6OnJlbGVhc2UoKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9BdHRhY2htZW50LmggYi9Tb3VyY2Uv V2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0F0dGFjaG1lbnQuaAppbmRleCBhNWFmNTU5MmQwM2I0 ODI4NjY0OTY4MTlkNWQyMGE0ZjQxYWMwZTlmLi43MTE1ZjBiNWY4NTE0NTg0ODRlYTYxYWE0NzIy NThjNmMwNDdlNDQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBD L0F0dGFjaG1lbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0F0dGFj aG1lbnQuaApAQCAtNDQsNyArNDQsNiBAQCBwdWJsaWM6CiAgICAgICAgIFVuaW5pdGlhbGl6ZWQs CiAjaWYgT1MoREFSV0lOKQogICAgICAgICBNYWNoUG9ydFR5cGUsCi0gICAgICAgIE1hY2hPT0xN ZW1vcnlUeXBlLAogI2VsaWYgVVNFKFVOSVhfRE9NQUlOX1NPQ0tFVFMpCiAgICAgICAgIFNvY2tl dFR5cGUsCiAgICAgICAgIE1hcHBlZE1lbW9yeVR5cGUKQEAgLTUzLDcgKzUyLDYgQEAgcHVibGlj OgogCiAjaWYgT1MoREFSV0lOKQogICAgIEF0dGFjaG1lbnQobWFjaF9wb3J0X25hbWVfdCBwb3J0 LCBtYWNoX21zZ190eXBlX25hbWVfdCBkaXNwb3NpdGlvbik7Ci0gICAgQXR0YWNobWVudCh2b2lk KiBhZGRyZXNzLCBtYWNoX21zZ19zaXplX3Qgc2l6ZSwgbWFjaF9tc2dfY29weV9vcHRpb25zX3Qg Y29weU9wdGlvbnMsIGJvb2wgZGVhbGxvY2F0ZSk7CiAjZWxpZiBVU0UoVU5JWF9ET01BSU5fU09D S0VUUykKICAgICBBdHRhY2htZW50KGludCBmaWxlRGVzY3JpcHRvciwgc2l6ZV90KTsKICAgICBB dHRhY2htZW50KGludCBmaWxlRGVzY3JpcHRvcik7CkBAIC02NSwxNCArNjMsOSBAQCBwdWJsaWM6 CiAgICAgdm9pZCByZWxlYXNlKCk7CiAKICAgICAvLyBNYWNoUG9ydFR5cGUKLSAgICBtYWNoX3Bv cnRfbmFtZV90IHBvcnQoKSBjb25zdCB7IEFTU0VSVChtX3R5cGUgPT0gTWFjaFBvcnRUeXBlKTsg cmV0dXJuIG1fcG9ydC5wb3J0OyB9Ci0gICAgbWFjaF9tc2dfdHlwZV9uYW1lX3QgZGlzcG9zaXRp b24oKSBjb25zdCB7IEFTU0VSVChtX3R5cGUgPT0gTWFjaFBvcnRUeXBlKTsgcmV0dXJuIG1fcG9y dC5kaXNwb3NpdGlvbjsgfQotCi0gICAgLy8gTWFjaE9PTE1lbW9yeVR5cGUKLSAgICB2b2lkKiBh ZGRyZXNzKCkgY29uc3QgeyBBU1NFUlQobV90eXBlID09IE1hY2hPT0xNZW1vcnlUeXBlKTsgcmV0 dXJuIG1fb29sTWVtb3J5LmFkZHJlc3M7IH0KLSAgICBtYWNoX21zZ19zaXplX3Qgc2l6ZSgpIGNv bnN0IHsgQVNTRVJUKG1fdHlwZSA9PSBNYWNoT09MTWVtb3J5VHlwZSk7IHJldHVybiBtX29vbE1l bW9yeS5zaXplOyB9Ci0gICAgbWFjaF9tc2dfY29weV9vcHRpb25zX3QgY29weU9wdGlvbnMoKSBj b25zdCB7IEFTU0VSVChtX3R5cGUgPT0gTWFjaE9PTE1lbW9yeVR5cGUpOyByZXR1cm4gbV9vb2xN ZW1vcnkuY29weU9wdGlvbnM7IH0KLSAgICBib29sIGRlYWxsb2NhdGUoKSBjb25zdCB7IEFTU0VS VChtX3R5cGUgPT0gTWFjaE9PTE1lbW9yeVR5cGUpOyByZXR1cm4gbV9vb2xNZW1vcnkuZGVhbGxv Y2F0ZTsgfQorICAgIG1hY2hfcG9ydF9uYW1lX3QgcG9ydCgpIGNvbnN0IHsgcmV0dXJuIG1fcG9y dDsgfQorICAgIG1hY2hfbXNnX3R5cGVfbmFtZV90IGRpc3Bvc2l0aW9uKCkgY29uc3QgeyByZXR1 cm4gbV9kaXNwb3NpdGlvbjsgfQorCiAjZWxpZiBVU0UoVU5JWF9ET01BSU5fU09DS0VUUykKICAg ICBzaXplX3Qgc2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fc2l6ZTsgfQogCkBAIC04OSwxOCArODIs OCBAQCBwcml2YXRlOgogICAgIFR5cGUgbV90eXBlOwogCiAjaWYgT1MoREFSV0lOKQotICAgIHVu aW9uIHsKLSAgICAgICAgc3RydWN0IHsKLSAgICAgICAgICAgIG1hY2hfcG9ydF9uYW1lX3QgcG9y dDsKLSAgICAgICAgICAgIG1hY2hfbXNnX3R5cGVfbmFtZV90IGRpc3Bvc2l0aW9uOwotICAgICAg ICB9IG1fcG9ydDsKLSAgICAgICAgc3RydWN0IHsKLSAgICAgICAgICAgIHZvaWQqIGFkZHJlc3M7 Ci0gICAgICAgICAgICBtYWNoX21zZ19zaXplX3Qgc2l6ZTsKLSAgICAgICAgICAgIG1hY2hfbXNn X2NvcHlfb3B0aW9uc190IGNvcHlPcHRpb25zOwotICAgICAgICAgICAgYm9vbCBkZWFsbG9jYXRl OwotICAgICAgICB9IG1fb29sTWVtb3J5OwotICAgIH07CisgICAgbWFjaF9wb3J0X25hbWVfdCBt X3BvcnQ7CisgICAgbWFjaF9tc2dfdHlwZV9uYW1lX3QgbV9kaXNwb3NpdGlvbjsKICNlbGlmIFVT RShVTklYX0RPTUFJTl9TT0NLRVRTKQogICAgIGludCBtX2ZpbGVEZXNjcmlwdG9yOwogICAgIHNp emVfdCBtX3NpemU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBD L21hYy9Db25uZWN0aW9uTWFjLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMv bWFjL0Nvbm5lY3Rpb25NYWMuY3BwCmluZGV4IDBjZDQ5YjNlYzljYmUzMWM4ZmY5MjlmZGY0NWM4 MzdhODQ4NDk3MjMuLjI3YmMyY2NkMTZiZGZmMzUyMWNmNDZiODQxNTA0NDU1NGEyMzJmOWUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvbWFjL0Nvbm5lY3Rpb25N YWMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvbWFjL0Nvbm5lY3Rp b25NYWMuY3BwCkBAIC0yMDEsOCArMjAxLDYgQEAgYm9vbCBDb25uZWN0aW9uOjpzZW5kT3V0Z29p bmdNZXNzYWdlKHN0ZDo6dW5pcXVlX3B0cjxNZXNzYWdlRW5jb2Rlcj4gZW5jb2RlcikKICAgICAg ICAgQXR0YWNobWVudDo6VHlwZSB0eXBlID0gYXR0YWNobWVudHNbaV0udHlwZSgpOwogICAgICAg ICBpZiAodHlwZSA9PSBBdHRhY2htZW50OjpNYWNoUG9ydFR5cGUpCiAgICAgICAgICAgICBudW1i ZXJPZlBvcnREZXNjcmlwdG9ycysrOwotICAgICAgICBlbHNlIGlmICh0eXBlID09IEF0dGFjaG1l bnQ6Ok1hY2hPT0xNZW1vcnlUeXBlKQotICAgICAgICAgICAgbnVtYmVyT2ZPT0xNZW1vcnlEZXNj cmlwdG9ycysrOwogICAgIH0KICAgICAKICAgICBzaXplX3QgbWVzc2FnZVNpemUgPSBtYWNoTWVz c2FnZVNpemUoZW5jb2Rlci0+YnVmZmVyU2l6ZSgpLCBudW1iZXJPZlBvcnREZXNjcmlwdG9ycywg bnVtYmVyT2ZPT0xNZW1vcnlEZXNjcmlwdG9ycyk7CkBAIC0yMTIsNyArMjEwLDYgQEAgYm9vbCBD b25uZWN0aW9uOjpzZW5kT3V0Z29pbmdNZXNzYWdlKHN0ZDo6dW5pcXVlX3B0cjxNZXNzYWdlRW5j b2Rlcj4gZW5jb2RlcikKICAgICBpZiAobWVzc2FnZVNpemUgPiBzaXplb2YoYnVmZmVyKSkgewog ICAgICAgICBtZXNzYWdlQm9keUlzT09MID0gdHJ1ZTsKIAotICAgICAgICBhdHRhY2htZW50cy5h cHBlbmQoQXR0YWNobWVudChlbmNvZGVyLT5idWZmZXIoKSwgZW5jb2Rlci0+YnVmZmVyU2l6ZSgp LCBNQUNIX01TR19WSVJUVUFMX0NPUFksIGZhbHNlKSk7CiAgICAgICAgIG51bWJlck9mT09MTWVt b3J5RGVzY3JpcHRvcnMrKzsKICAgICAgICAgbWVzc2FnZVNpemUgPSBtYWNoTWVzc2FnZVNpemUo MCwgbnVtYmVyT2ZQb3J0RGVzY3JpcHRvcnMsIG51bWJlck9mT09MTWVtb3J5RGVzY3JpcHRvcnMp OwogICAgIH0KQEAgLTIyMCw3ICsyMTcsNyBAQCBib29sIENvbm5lY3Rpb246OnNlbmRPdXRnb2lu Z01lc3NhZ2Uoc3RkOjp1bmlxdWVfcHRyPE1lc3NhZ2VFbmNvZGVyPiBlbmNvZGVyKQogICAgIGJv b2wgaXNDb21wbGV4ID0gKG51bWJlck9mUG9ydERlc2NyaXB0b3JzICsgbnVtYmVyT2ZPT0xNZW1v cnlEZXNjcmlwdG9ycyA+IDApOwogCiAgICAgbWFjaF9tc2dfaGVhZGVyX3QqIGhlYWRlciA9IHJl aW50ZXJwcmV0X2Nhc3Q8bWFjaF9tc2dfaGVhZGVyX3QqPigmYnVmZmVyKTsKLSAgICBoZWFkZXIt Pm1zZ2hfYml0cyA9IGlzQ29tcGxleCA/IE1BQ0hfTVNHSF9CSVRTKE1BQ0hfTVNHX1RZUEVfQ09Q WV9TRU5EIHwgTUFDSF9NU0dIX0JJVFNfQ09NUExFWCwgMCkgOiBNQUNIX01TR0hfQklUUyhNQUNI X01TR19UWVBFX0NPUFlfU0VORCwgMCk7CisgICAgaGVhZGVyLT5tc2doX2JpdHMgPSBNQUNIX01T R0hfQklUUyhNQUNIX01TR19UWVBFX0NPUFlfU0VORCwgMCk7CiAgICAgaGVhZGVyLT5tc2doX3Np emUgPSBtZXNzYWdlU2l6ZTsKICAgICBoZWFkZXItPm1zZ2hfcmVtb3RlX3BvcnQgPSBtX3NlbmRQ b3J0OwogICAgIGhlYWRlci0+bXNnaF9sb2NhbF9wb3J0ID0gTUFDSF9QT1JUX05VTEw7CkBAIC0y MzEsMTAgKzIyOCwxMiBAQCBib29sIENvbm5lY3Rpb246OnNlbmRPdXRnb2luZ01lc3NhZ2Uoc3Rk Ojp1bmlxdWVfcHRyPE1lc3NhZ2VFbmNvZGVyPiBlbmNvZGVyKQogICAgIHVpbnQ4X3QqIG1lc3Nh Z2VEYXRhOwogCiAgICAgaWYgKGlzQ29tcGxleCkgeworICAgICAgICBoZWFkZXItPm1zZ2hfYml0 cyB8PSBNQUNIX01TR0hfQklUU19DT01QTEVYOworCiAgICAgICAgIG1hY2hfbXNnX2JvZHlfdCog Ym9keSA9IHJlaW50ZXJwcmV0X2Nhc3Q8bWFjaF9tc2dfYm9keV90Kj4oaGVhZGVyICsgMSk7CiAg ICAgICAgIGJvZHktPm1zZ2hfZGVzY3JpcHRvcl9jb3VudCA9IG51bWJlck9mUG9ydERlc2NyaXB0 b3JzICsgbnVtYmVyT2ZPT0xNZW1vcnlEZXNjcmlwdG9yczsKLQogICAgICAgICB1aW50OF90KiBk ZXNjcmlwdG9yRGF0YSA9IHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhfdCo+KGJvZHkgKyAxKTsKKwog ICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGF0dGFjaG1lbnRzLnNpemUoKTsgKytpKSB7 CiAgICAgICAgICAgICBBdHRhY2htZW50IGF0dGFjaG1lbnQgPSBhdHRhY2htZW50c1tpXTsKIApA QCAtMjQ3LDIwICsyNDYsMjMgQEAgYm9vbCBDb25uZWN0aW9uOjpzZW5kT3V0Z29pbmdNZXNzYWdl KHN0ZDo6dW5pcXVlX3B0cjxNZXNzYWdlRW5jb2Rlcj4gZW5jb2RlcikKIAogICAgICAgICAgICAg ICAgIGRlc2NyaXB0b3JEYXRhICs9IHNpemVvZihtYWNoX21zZ19wb3J0X2Rlc2NyaXB0b3JfdCk7 CiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIEF0dGFjaG1lbnQ6Ok1h Y2hPT0xNZW1vcnlUeXBlOgotICAgICAgICAgICAgICAgIGRlc2NyaXB0b3ItPm91dF9vZl9saW5l LmFkZHJlc3MgPSBhdHRhY2htZW50LmFkZHJlc3MoKTsKLSAgICAgICAgICAgICAgICBkZXNjcmlw dG9yLT5vdXRfb2ZfbGluZS5zaXplID0gYXR0YWNobWVudC5zaXplKCk7Ci0gICAgICAgICAgICAg ICAgZGVzY3JpcHRvci0+b3V0X29mX2xpbmUuY29weSA9IGF0dGFjaG1lbnQuY29weU9wdGlvbnMo KTsKLSAgICAgICAgICAgICAgICBkZXNjcmlwdG9yLT5vdXRfb2ZfbGluZS5kZWFsbG9jYXRlID0g YXR0YWNobWVudC5kZWFsbG9jYXRlKCk7Ci0gICAgICAgICAgICAgICAgZGVzY3JpcHRvci0+b3V0 X29mX2xpbmUudHlwZSA9IE1BQ0hfTVNHX09PTF9ERVNDUklQVE9SOyAgICAgICAgICAgIAotCi0g ICAgICAgICAgICAgICAgZGVzY3JpcHRvckRhdGEgKz0gc2l6ZW9mKG1hY2hfbXNnX29vbF9kZXNj cmlwdG9yX3QpOwotICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgZGVmYXVsdDoK ICAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgICAgIH0KICAg ICAgICAgfQogCisgICAgICAgIGlmIChtZXNzYWdlQm9keUlzT09MKSB7CisgICAgICAgICAgICBt YWNoX21zZ19kZXNjcmlwdG9yX3QqIGRlc2NyaXB0b3IgPSByZWludGVycHJldF9jYXN0PG1hY2hf bXNnX2Rlc2NyaXB0b3JfdCo+KGRlc2NyaXB0b3JEYXRhKTsKKworICAgICAgICAgICAgZGVzY3Jp cHRvci0+b3V0X29mX2xpbmUuYWRkcmVzcyA9IGVuY29kZXItPmJ1ZmZlcigpOworICAgICAgICAg ICAgZGVzY3JpcHRvci0+b3V0X29mX2xpbmUuc2l6ZSA9IGVuY29kZXItPmJ1ZmZlclNpemUoKTsK KyAgICAgICAgICAgIGRlc2NyaXB0b3ItPm91dF9vZl9saW5lLmNvcHkgPSBNQUNIX01TR19WSVJU VUFMX0NPUFk7CisgICAgICAgICAgICBkZXNjcmlwdG9yLT5vdXRfb2ZfbGluZS5kZWFsbG9jYXRl ID0gZmFsc2U7CisgICAgICAgICAgICBkZXNjcmlwdG9yLT5vdXRfb2ZfbGluZS50eXBlID0gTUFD SF9NU0dfT09MX0RFU0NSSVBUT1I7CisKKyAgICAgICAgICAgIGRlc2NyaXB0b3JEYXRhICs9IHNp emVvZihtYWNoX21zZ19vb2xfZGVzY3JpcHRvcl90KTsKKyAgICAgICAgfQorCiAgICAgICAgIG1l c3NhZ2VEYXRhID0gZGVzY3JpcHRvckRhdGE7CiAgICAgfSBlbHNlCiAgICAgICAgIG1lc3NhZ2VE YXRhID0gKHVpbnQ4X3QqKShoZWFkZXIgKyAxKTsKQEAgLTMyNiwxMCArMzI4LDYgQEAgc3RhdGlj IHN0ZDo6dW5pcXVlX3B0cjxNZXNzYWdlRGVjb2Rlcj4gY3JlYXRlTWVzc2FnZURlY29kZXIobWFj aF9tc2dfaGVhZGVyX3QqIGgKICAgICAgICAgICAgIGF0dGFjaG1lbnRzW251bURlc2NyaXB0b3Jz IC0gaSAtIDFdID0gQXR0YWNobWVudChkZXNjcmlwdG9yLT5wb3J0Lm5hbWUsIGRlc2NyaXB0b3It PnBvcnQuZGlzcG9zaXRpb24pOwogICAgICAgICAgICAgZGVzY3JpcHRvckRhdGEgKz0gc2l6ZW9m KG1hY2hfbXNnX3BvcnRfZGVzY3JpcHRvcl90KTsKICAgICAgICAgICAgIGJyZWFrOwotICAgICAg ICBjYXNlIE1BQ0hfTVNHX09PTF9ERVNDUklQVE9SOgotICAgICAgICAgICAgYXR0YWNobWVudHNb bnVtRGVzY3JpcHRvcnMgLSBpIC0gMV0gPSBBdHRhY2htZW50KGRlc2NyaXB0b3ItPm91dF9vZl9s aW5lLmFkZHJlc3MsIGRlc2NyaXB0b3ItPm91dF9vZl9saW5lLnNpemUsIGRlc2NyaXB0b3ItPm91 dF9vZl9saW5lLmNvcHksIGRlc2NyaXB0b3ItPm91dF9vZl9saW5lLmRlYWxsb2NhdGUpOwotICAg ICAgICAgICAgZGVzY3JpcHRvckRhdGEgKz0gc2l6ZW9mKG1hY2hfbXNnX29vbF9kZXNjcmlwdG9y X3QpOwotICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICBB U1NFUlQoZmFsc2UgJiYgIlVuaGFuZGxlZCBkZXNjcmlwdG9yIHR5cGUiKTsKICAgICAgICAgfQpA QCAtMzM4LDE1ICszMzYsMTMgQEAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxNZXNzYWdlRGVjb2Rl cj4gY3JlYXRlTWVzc2FnZURlY29kZXIobWFjaF9tc2dfaGVhZGVyX3QqIGgKICAgICBpZiAobWVz c2FnZUJvZHlJc09PTCkgewogICAgICAgICBtYWNoX21zZ19kZXNjcmlwdG9yX3QqIGRlc2NyaXB0 b3IgPSByZWludGVycHJldF9jYXN0PG1hY2hfbXNnX2Rlc2NyaXB0b3JfdCo+KGRlc2NyaXB0b3JE YXRhKTsKICAgICAgICAgQVNTRVJUKGRlc2NyaXB0b3ItPnR5cGUudHlwZSA9PSBNQUNIX01TR19P T0xfREVTQ1JJUFRPUik7Ci0gICAgICAgIEF0dGFjaG1lbnQgbWVzc2FnZUJvZHlBdHRhY2htZW50 KGRlc2NyaXB0b3ItPm91dF9vZl9saW5lLmFkZHJlc3MsIGRlc2NyaXB0b3ItPm91dF9vZl9saW5l LnNpemUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRlc2NyaXB0 b3ItPm91dF9vZl9saW5lLmNvcHksIGRlc2NyaXB0b3ItPm91dF9vZl9saW5lLmRlYWxsb2NhdGUp OwogCi0gICAgICAgIHVpbnQ4X3QqIG1lc3NhZ2VCb2R5ID0gc3RhdGljX2Nhc3Q8dWludDhfdCo+ KG1lc3NhZ2VCb2R5QXR0YWNobWVudC5hZGRyZXNzKCkpOwotICAgICAgICBzaXplX3QgbWVzc2Fn ZUJvZHlTaXplID0gbWVzc2FnZUJvZHlBdHRhY2htZW50LnNpemUoKTsKKyAgICAgICAgdWludDhf dCogbWVzc2FnZUJvZHkgPSBzdGF0aWNfY2FzdDx1aW50OF90Kj4oZGVzY3JpcHRvci0+b3V0X29m X2xpbmUuYWRkcmVzcyk7CisgICAgICAgIHNpemVfdCBtZXNzYWdlQm9keVNpemUgPSBkZXNjcmlw dG9yLT5vdXRfb2ZfbGluZS5zaXplOwogCiAgICAgICAgIGF1dG8gZGVjb2RlciA9IHN0ZDo6bWFr ZV91bmlxdWU8TWVzc2FnZURlY29kZXI+KERhdGFSZWZlcmVuY2UobWVzc2FnZUJvZHksIG1lc3Nh Z2VCb2R5U2l6ZSksIHN0ZDo6bW92ZShhdHRhY2htZW50cykpOwogCi0gICAgICAgIHZtX2RlYWxs b2NhdGUobWFjaF90YXNrX3NlbGYoKSwgcmVpbnRlcnByZXRfY2FzdDx2bV9hZGRyZXNzX3Q+KG1l c3NhZ2VCb2R5QXR0YWNobWVudC5hZGRyZXNzKCkpLCBtZXNzYWdlQm9keUF0dGFjaG1lbnQuc2l6 ZSgpKTsKKyAgICAgICAgdm1fZGVhbGxvY2F0ZShtYWNoX3Rhc2tfc2VsZigpLCByZWludGVycHJl dF9jYXN0PHZtX2FkZHJlc3NfdD4oZGVzY3JpcHRvci0+b3V0X29mX2xpbmUuYWRkcmVzcyksIGRl c2NyaXB0b3ItPm91dF9vZl9saW5lLnNpemUpOwogCiAgICAgICAgIHJldHVybiBkZWNvZGVyOwog ICAgIH0K