86979 2012-05-20 19:04:20 -0700 [V8] Pass Isolate to V8NPObject::npObjectGetProperty() and V8NPObject::npObjectSetProperty() 2012-05-20 23:19:23 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 84074 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 628712 0 haraken 2012-05-20 19:04:20 -0700 The objective is to pass Isolate around in V8 bindings. In this bug we pass Isolate to V8NPObject::npObjectGetProperty() and V8NPObject::npObjectSetProperty(). 628714 1 142934 haraken 2012-05-20 19:07:36 -0700 Created attachment 142934 Patch 628800 2 142934 webkit.review.bot 2012-05-20 23:19:18 -0700 Comment on attachment 142934 Patch Clearing flags on attachment: 142934 Committed r117732: <http://trac.webkit.org/changeset/117732> 628801 3 webkit.review.bot 2012-05-20 23:19:23 -0700 All reviewed patches have been landed. Closing bug. 142934 2012-05-20 19:07:36 -0700 2012-05-20 23:19:18 -0700 Patch bug-86979-20120521110735.patch text/plain 12854 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NzE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTZiZWE0YWZiZDFlZjhk MTY2ZjY2MzU1YmZlMDJiNDdhZWMzMjg1OC4uYzA3YWIyNjU4YmU2ZTA5OTE5ZTc1Y2NmZDRmZjM1 YjdkY2U5YmNlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA1LTIwICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIFBhc3MgSXNv bGF0ZSB0byBWOE5QT2JqZWN0OjpucE9iamVjdEdldFByb3BlcnR5KCkgYW5kIFY4TlBPYmplY3Q6 Om5wT2JqZWN0U2V0UHJvcGVydHkoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODY5NzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGUgb2JqZWN0aXZlIGlzIHRvIHBhc3MgSXNvbGF0ZSBhcm91bmQgaW4g VjggYmluZGluZ3MuCisgICAgICAgIFRoaXMgcGF0Y2ggcGFzc2VzIElzb2xhdGUgdG8gVjhOUE9i amVjdDo6bnBPYmplY3RHZXRQcm9wZXJ0eSgpCisgICAgICAgIGFuZCBWOE5QT2JqZWN0OjpucE9i amVjdFNldFByb3BlcnR5KCkuCisKKyAgICAgICAgTm8gdGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhh dmlvci4KKworICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4TlBPYmplY3QuY3BwOgorICAgICAgICAo V2ViQ29yZTo6bnBPYmplY3RHZXRQcm9wZXJ0eSk6CisgICAgICAgIChXZWJDb3JlOjpucE9iamVj dE5hbWVkUHJvcGVydHlHZXR0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6bnBPYmplY3RJbmRleGVk UHJvcGVydHlHZXR0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6bnBPYmplY3RHZXROYW1lZFByb3Bl cnR5KToKKyAgICAgICAgKFdlYkNvcmU6Om5wT2JqZWN0R2V0SW5kZXhlZFByb3BlcnR5KToKKyAg ICAgICAgKFdlYkNvcmU6Om5wT2JqZWN0UXVlcnlQcm9wZXJ0eSk6CisgICAgICAgIChXZWJDb3Jl OjpucE9iamVjdFNldFByb3BlcnR5KToKKyAgICAgICAgKFdlYkNvcmU6Om5wT2JqZWN0TmFtZWRQ cm9wZXJ0eVNldHRlcik6CisgICAgICAgIChXZWJDb3JlOjpucE9iamVjdEluZGV4ZWRQcm9wZXJ0 eVNldHRlcik6CisgICAgICAgIChXZWJDb3JlOjpucE9iamVjdFNldE5hbWVkUHJvcGVydHkpOgor ICAgICAgICAoV2ViQ29yZTo6bnBPYmplY3RTZXRJbmRleGVkUHJvcGVydHkpOgorICAgICAgICAq IGJpbmRpbmdzL3Y4L1Y4TlBPYmplY3QuaDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAq IGJpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxQbHVnSW5FbGVtZW50Q3VzdG9tLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Om5wT2JqZWN0TmFtZWRHZXR0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6bnBP YmplY3ROYW1lZFNldHRlcik6CisgICAgICAgIChXZWJDb3JlOjpucE9iamVjdEluZGV4ZWRHZXR0 ZXIpOgorICAgICAgICAoV2ViQ29yZTo6bnBPYmplY3RJbmRleGVkU2V0dGVyKToKKwogMjAxMi0w NS0yMCAgR2VvcmdlIFN0YWlrb3MgIDxzdGFpa29zQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVXNl IHJlaW50ZXJwcmV0X2Nhc3RfcHRyPD4gdG8gZml4IGFuIGFsaWdubWVudCB3YXJuaW5nLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhOUE9iamVjdC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOE5QT2JqZWN0LmNwcAppbmRleCA1YTU4ZDgyNzIyNmE5 Mjc2ZmE4N2JkODc0MTk5YmExOWMzNThlZWEzLi5jNzc0MzE5NDNkZmZiNzM0MzA2MjRkYTlkZWNm ZmU2MTc2NTc5M2MzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOE5Q T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOE5QT2JqZWN0LmNw cApAQCAtMTgzLDE5ICsxODMsMTkgQEAgc3RhdGljIHZvaWQgd2Vha1RlbXBsYXRlQ2FsbGJhY2so djg6OlBlcnNpc3RlbnQ8djg6OlZhbHVlPiBvYmplY3QsIHZvaWQqIHBhcmFtZXQKIH0KIAogCi1z dGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IG5wT2JqZWN0R2V0UHJvcGVydHkodjg6OkxvY2Fs PHY4OjpPYmplY3Q+IHNlbGYsIE5QSWRlbnRpZmllciBpZGVudGlmaWVyLCB2ODo6TG9jYWw8djg6 OlZhbHVlPiBrZXkpCitzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IG5wT2JqZWN0R2V0UHJv cGVydHkodjg6OkxvY2FsPHY4OjpPYmplY3Q+IHNlbGYsIE5QSWRlbnRpZmllciBpZGVudGlmaWVy LCB2ODo6TG9jYWw8djg6OlZhbHVlPiBrZXksIHY4OjpJc29sYXRlKiBpc29sYXRlKQogewogICAg IE5QT2JqZWN0KiBucE9iamVjdCA9IHY4T2JqZWN0VG9OUE9iamVjdChzZWxmKTsKIAogICAgIC8v IFZlcmlmeSB0aGF0IG91ciB3cmFwcGVyIHdhc24ndCB1c2luZyBhIE5QT2JqZWN0IHdoaWNoCiAg ICAgLy8gaGFzIGFscmVhZHkgYmVlbiBkZWxldGVkLgogICAgIGlmICghbnBPYmplY3QgfHwgIV9O UE5fSXNBbGl2ZShucE9iamVjdCkpCi0gICAgICAgIHJldHVybiBWOFByb3h5Ojp0aHJvd0Vycm9y KFY4UHJveHk6OlJlZmVyZW5jZUVycm9yLCAiTlBPYmplY3QgZGVsZXRlZCIpOworICAgICAgICBy ZXR1cm4gVjhQcm94eTo6dGhyb3dFcnJvcihWOFByb3h5OjpSZWZlcmVuY2VFcnJvciwgIk5QT2Jq ZWN0IGRlbGV0ZWQiLCBpc29sYXRlKTsKIAogCiAgICAgaWYgKG5wT2JqZWN0LT5fY2xhc3MtPmhh c1Byb3BlcnR5ICYmIG5wT2JqZWN0LT5fY2xhc3MtPmdldFByb3BlcnR5ICYmIG5wT2JqZWN0LT5f Y2xhc3MtPmhhc1Byb3BlcnR5KG5wT2JqZWN0LCBpZGVudGlmaWVyKSkgewogICAgICAgICBpZiAo IV9OUE5fSXNBbGl2ZShucE9iamVjdCkpCi0gICAgICAgICAgICByZXR1cm4gVjhQcm94eTo6dGhy b3dFcnJvcihWOFByb3h5OjpSZWZlcmVuY2VFcnJvciwgIk5QT2JqZWN0IGRlbGV0ZWQiKTsKKyAg ICAgICAgICAgIHJldHVybiBWOFByb3h5Ojp0aHJvd0Vycm9yKFY4UHJveHk6OlJlZmVyZW5jZUVy cm9yLCAiTlBPYmplY3QgZGVsZXRlZCIsIGlzb2xhdGUpOwogCiAgICAgICAgIE5QVmFyaWFudCBy ZXN1bHQ7CiAgICAgICAgIFZPSURfVE9fTlBWQVJJQU5UKHJlc3VsdCk7CkBAIC0yMTEsMTEgKzIx MSwxMSBAQCBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IG5wT2JqZWN0R2V0UHJvcGVydHko djg6OkxvY2FsPHY4OjpPYmplY3Q+IHNlbGYsIE5QSQogICAgIH0KIAogICAgIGlmICghX05QTl9J c0FsaXZlKG5wT2JqZWN0KSkKLSAgICAgICAgcmV0dXJuIFY4UHJveHk6OnRocm93RXJyb3IoVjhQ cm94eTo6UmVmZXJlbmNlRXJyb3IsICJOUE9iamVjdCBkZWxldGVkIik7CisgICAgICAgIHJldHVy biBWOFByb3h5Ojp0aHJvd0Vycm9yKFY4UHJveHk6OlJlZmVyZW5jZUVycm9yLCAiTlBPYmplY3Qg ZGVsZXRlZCIsIGlzb2xhdGUpOwogCiAgICAgaWYgKGtleS0+SXNTdHJpbmcoKSAmJiBucE9iamVj dC0+X2NsYXNzLT5oYXNNZXRob2QgJiYgbnBPYmplY3QtPl9jbGFzcy0+aGFzTWV0aG9kKG5wT2Jq ZWN0LCBpZGVudGlmaWVyKSkgewogICAgICAgICBpZiAoIV9OUE5fSXNBbGl2ZShucE9iamVjdCkp Ci0gICAgICAgICAgICByZXR1cm4gVjhQcm94eTo6dGhyb3dFcnJvcihWOFByb3h5OjpSZWZlcmVu Y2VFcnJvciwgIk5QT2JqZWN0IGRlbGV0ZWQiKTsKKyAgICAgICAgICAgIHJldHVybiBWOFByb3h5 Ojp0aHJvd0Vycm9yKFY4UHJveHk6OlJlZmVyZW5jZUVycm9yLCAiTlBPYmplY3QgZGVsZXRlZCIs IGlzb2xhdGUpOwogCiAgICAgICAgIFByaXZhdGVJZGVudGlmaWVyKiBpZCA9IHN0YXRpY19jYXN0 PFByaXZhdGVJZGVudGlmaWVyKj4oaWRlbnRpZmllcik7CiAgICAgICAgIHY4OjpQZXJzaXN0ZW50 PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBmdW5jdGlvblRlbXBsYXRlID0gc3RhdGljVGVtcGxhdGVN YXAoKS5nZXQoaWQpOwpAQCAtMjQwLDQ2ICsyNDAsNDYgQEAgc3RhdGljIHY4OjpIYW5kbGU8djg6 OlZhbHVlPiBucE9iamVjdEdldFByb3BlcnR5KHY4OjpMb2NhbDx2ODo6T2JqZWN0PiBzZWxmLCBO UEkKIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBucE9iamVjdE5hbWVkUHJvcGVydHlHZXR0ZXIodjg6 OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIGNvbnN0IHY4OjpBY2Nlc3NvckluZm8mIGluZm8pCiB7 CiAgICAgTlBJZGVudGlmaWVyIGlkZW50aWZpZXIgPSBnZXRTdHJpbmdJZGVudGlmaWVyKG5hbWUp OwotICAgIHJldHVybiBucE9iamVjdEdldFByb3BlcnR5KGluZm8uSG9sZGVyKCksIGlkZW50aWZp ZXIsIG5hbWUpOworICAgIHJldHVybiBucE9iamVjdEdldFByb3BlcnR5KGluZm8uSG9sZGVyKCks IGlkZW50aWZpZXIsIG5hbWUsIGluZm8uR2V0SXNvbGF0ZSgpKTsKIH0KIAogdjg6OkhhbmRsZTx2 ODo6VmFsdWU+IG5wT2JqZWN0SW5kZXhlZFByb3BlcnR5R2V0dGVyKHVpbnQzMl90IGluZGV4LCBj b25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZvKQogewogICAgIE5QSWRlbnRpZmllciBpZGVudGlm aWVyID0gX05QTl9HZXRJbnRJZGVudGlmaWVyKGluZGV4KTsKLSAgICByZXR1cm4gbnBPYmplY3RH ZXRQcm9wZXJ0eShpbmZvLkhvbGRlcigpLCBpZGVudGlmaWVyLCB2ODo6TnVtYmVyOjpOZXcoaW5k ZXgpKTsKKyAgICByZXR1cm4gbnBPYmplY3RHZXRQcm9wZXJ0eShpbmZvLkhvbGRlcigpLCBpZGVu dGlmaWVyLCB2ODo6TnVtYmVyOjpOZXcoaW5kZXgpLCBpbmZvLkdldElzb2xhdGUoKSk7CiB9CiAK LXY4OjpIYW5kbGU8djg6OlZhbHVlPiBucE9iamVjdEdldE5hbWVkUHJvcGVydHkodjg6OkxvY2Fs PHY4OjpPYmplY3Q+IHNlbGYsIHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBuYW1lKQordjg6OkhhbmRs ZTx2ODo6VmFsdWU+IG5wT2JqZWN0R2V0TmFtZWRQcm9wZXJ0eSh2ODo6TG9jYWw8djg6Ok9iamVj dD4gc2VsZiwgdjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIGNvbnN0IHY4OjpBY2Nlc3Nvcklu Zm8mIGluZm8pCiB7CiAgICAgTlBJZGVudGlmaWVyIGlkZW50aWZpZXIgPSBnZXRTdHJpbmdJZGVu dGlmaWVyKG5hbWUpOwotICAgIHJldHVybiBucE9iamVjdEdldFByb3BlcnR5KHNlbGYsIGlkZW50 aWZpZXIsIG5hbWUpOworICAgIHJldHVybiBucE9iamVjdEdldFByb3BlcnR5KHNlbGYsIGlkZW50 aWZpZXIsIG5hbWUsIGluZm8uR2V0SXNvbGF0ZSgpKTsKIH0KIAotdjg6OkhhbmRsZTx2ODo6VmFs dWU+IG5wT2JqZWN0R2V0SW5kZXhlZFByb3BlcnR5KHY4OjpMb2NhbDx2ODo6T2JqZWN0PiBzZWxm LCB1aW50MzJfdCBpbmRleCkKK3Y4OjpIYW5kbGU8djg6OlZhbHVlPiBucE9iamVjdEdldEluZGV4 ZWRQcm9wZXJ0eSh2ODo6TG9jYWw8djg6Ok9iamVjdD4gc2VsZiwgdWludDMyX3QgaW5kZXgsIGNv bnN0IHY4OjpBY2Nlc3NvckluZm8mIGluZm8pCiB7CiAgICAgTlBJZGVudGlmaWVyIGlkZW50aWZp ZXIgPSBfTlBOX0dldEludElkZW50aWZpZXIoaW5kZXgpOwotICAgIHJldHVybiBucE9iamVjdEdl dFByb3BlcnR5KHNlbGYsIGlkZW50aWZpZXIsIHY4OjpOdW1iZXI6Ok5ldyhpbmRleCkpOworICAg IHJldHVybiBucE9iamVjdEdldFByb3BlcnR5KHNlbGYsIGlkZW50aWZpZXIsIHY4OjpOdW1iZXI6 Ok5ldyhpbmRleCksIGluZm8uR2V0SXNvbGF0ZSgpKTsKIH0KIAogdjg6OkhhbmRsZTx2ODo6SW50 ZWdlcj4gbnBPYmplY3RRdWVyeVByb3BlcnR5KHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBuYW1lLCBj b25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZvKQogewogICAgIE5QSWRlbnRpZmllciBpZGVudGlm aWVyID0gZ2V0U3RyaW5nSWRlbnRpZmllcihuYW1lKTsKLSAgICByZXR1cm4gbnBPYmplY3RHZXRQ cm9wZXJ0eShpbmZvLkhvbGRlcigpLCBpZGVudGlmaWVyLCBuYW1lKS5Jc0VtcHR5KCkgPyB2ODo6 SGFuZGxlPHY4OjpJbnRlZ2VyPigpIDogdjg6OkludGVnZXI6Ok5ldyh2ODo6Tm9uZSk7CisgICAg cmV0dXJuIG5wT2JqZWN0R2V0UHJvcGVydHkoaW5mby5Ib2xkZXIoKSwgaWRlbnRpZmllciwgbmFt ZSwgaW5mby5HZXRJc29sYXRlKCkpLklzRW1wdHkoKSA/IHY4OjpIYW5kbGU8djg6OkludGVnZXI+ KCkgOiB2ODo6SW50ZWdlcjo6TmV3KHY4OjpOb25lKTsKIH0KIAotc3RhdGljIHY4OjpIYW5kbGU8 djg6OlZhbHVlPiBucE9iamVjdFNldFByb3BlcnR5KHY4OjpMb2NhbDx2ODo6T2JqZWN0PiBzZWxm LCBOUElkZW50aWZpZXIgaWRlbnRpZmllciwgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gdmFsdWUpCitz dGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IG5wT2JqZWN0U2V0UHJvcGVydHkodjg6OkxvY2Fs PHY4OjpPYmplY3Q+IHNlbGYsIE5QSWRlbnRpZmllciBpZGVudGlmaWVyLCB2ODo6TG9jYWw8djg6 OlZhbHVlPiB2YWx1ZSwgdjg6Oklzb2xhdGUqIGlzb2xhdGUpCiB7CiAgICAgTlBPYmplY3QqIG5w T2JqZWN0ID0gdjhPYmplY3RUb05QT2JqZWN0KHNlbGYpOwogCiAgICAgLy8gVmVyaWZ5IHRoYXQg b3VyIHdyYXBwZXIgd2Fzbid0IHVzaW5nIGEgTlBPYmplY3Qgd2hpY2ggaGFzIGFscmVhZHkgYmVl biBkZWxldGVkLgogICAgIGlmICghbnBPYmplY3QgfHwgIV9OUE5fSXNBbGl2ZShucE9iamVjdCkp IHsKLSAgICAgICAgVjhQcm94eTo6dGhyb3dFcnJvcihWOFByb3h5OjpSZWZlcmVuY2VFcnJvciwg Ik5QT2JqZWN0IGRlbGV0ZWQiKTsKKyAgICAgICAgVjhQcm94eTo6dGhyb3dFcnJvcihWOFByb3h5 OjpSZWZlcmVuY2VFcnJvciwgIk5QT2JqZWN0IGRlbGV0ZWQiLCBpc29sYXRlKTsKICAgICAgICAg cmV0dXJuIHZhbHVlOyAgLy8gSW50ZXJjZXB0ZWQsIGJ1dCBhbiBleGNlcHRpb24gd2FzIHRocm93 bi4KICAgICB9CiAKICAgICBpZiAobnBPYmplY3QtPl9jbGFzcy0+aGFzUHJvcGVydHkgJiYgbnBP YmplY3QtPl9jbGFzcy0+c2V0UHJvcGVydHkgJiYgbnBPYmplY3QtPl9jbGFzcy0+aGFzUHJvcGVy dHkobnBPYmplY3QsIGlkZW50aWZpZXIpKSB7CiAgICAgICAgIGlmICghX05QTl9Jc0FsaXZlKG5w T2JqZWN0KSkKLSAgICAgICAgICAgIHJldHVybiBWOFByb3h5Ojp0aHJvd0Vycm9yKFY4UHJveHk6 OlJlZmVyZW5jZUVycm9yLCAiTlBPYmplY3QgZGVsZXRlZCIpOworICAgICAgICAgICAgcmV0dXJu IFY4UHJveHk6OnRocm93RXJyb3IoVjhQcm94eTo6UmVmZXJlbmNlRXJyb3IsICJOUE9iamVjdCBk ZWxldGVkIiwgaXNvbGF0ZSk7CiAKICAgICAgICAgTlBWYXJpYW50IG5wVmFsdWU7CiAgICAgICAg IFZPSURfVE9fTlBWQVJJQU5UKG5wVmFsdWUpOwpAQCAtMjk2LDI2ICsyOTYsMjYgQEAgc3RhdGlj IHY4OjpIYW5kbGU8djg6OlZhbHVlPiBucE9iamVjdFNldFByb3BlcnR5KHY4OjpMb2NhbDx2ODo6 T2JqZWN0PiBzZWxmLCBOUEkKIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBucE9iamVjdE5hbWVkUHJv cGVydHlTZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIHY4OjpMb2NhbDx2ODo6VmFs dWU+IHZhbHVlLCBjb25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZvKQogewogICAgIE5QSWRlbnRp ZmllciBpZGVudGlmaWVyID0gZ2V0U3RyaW5nSWRlbnRpZmllcihuYW1lKTsKLSAgICByZXR1cm4g bnBPYmplY3RTZXRQcm9wZXJ0eShpbmZvLkhvbGRlcigpLCBpZGVudGlmaWVyLCB2YWx1ZSk7Cisg ICAgcmV0dXJuIG5wT2JqZWN0U2V0UHJvcGVydHkoaW5mby5Ib2xkZXIoKSwgaWRlbnRpZmllciwg dmFsdWUsIGluZm8uR2V0SXNvbGF0ZSgpKTsKIH0KIAogCiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4g bnBPYmplY3RJbmRleGVkUHJvcGVydHlTZXR0ZXIodWludDMyX3QgaW5kZXgsIHY4OjpMb2NhbDx2 ODo6VmFsdWU+IHZhbHVlLCBjb25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZvKQogewogICAgIE5Q SWRlbnRpZmllciBpZGVudGlmaWVyID0gX05QTl9HZXRJbnRJZGVudGlmaWVyKGluZGV4KTsKLSAg ICByZXR1cm4gbnBPYmplY3RTZXRQcm9wZXJ0eShpbmZvLkhvbGRlcigpLCBpZGVudGlmaWVyLCB2 YWx1ZSk7CisgICAgcmV0dXJuIG5wT2JqZWN0U2V0UHJvcGVydHkoaW5mby5Ib2xkZXIoKSwgaWRl bnRpZmllciwgdmFsdWUsIGluZm8uR2V0SXNvbGF0ZSgpKTsKIH0KIAotdjg6OkhhbmRsZTx2ODo6 VmFsdWU+IG5wT2JqZWN0U2V0TmFtZWRQcm9wZXJ0eSh2ODo6TG9jYWw8djg6Ok9iamVjdD4gc2Vs Ziwgdjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIHY4OjpMb2NhbDx2ODo6VmFsdWU+IHZhbHVl KQordjg6OkhhbmRsZTx2ODo6VmFsdWU+IG5wT2JqZWN0U2V0TmFtZWRQcm9wZXJ0eSh2ODo6TG9j YWw8djg6Ok9iamVjdD4gc2VsZiwgdjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIHY4OjpMb2Nh bDx2ODo6VmFsdWU+IHZhbHVlLCBjb25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZvKQogewogICAg IE5QSWRlbnRpZmllciBpZGVudGlmaWVyID0gZ2V0U3RyaW5nSWRlbnRpZmllcihuYW1lKTsKLSAg ICByZXR1cm4gbnBPYmplY3RTZXRQcm9wZXJ0eShzZWxmLCBpZGVudGlmaWVyLCB2YWx1ZSk7Cisg ICAgcmV0dXJuIG5wT2JqZWN0U2V0UHJvcGVydHkoc2VsZiwgaWRlbnRpZmllciwgdmFsdWUsIGlu Zm8uR2V0SXNvbGF0ZSgpKTsKIH0KIAotdjg6OkhhbmRsZTx2ODo6VmFsdWU+IG5wT2JqZWN0U2V0 SW5kZXhlZFByb3BlcnR5KHY4OjpMb2NhbDx2ODo6T2JqZWN0PiBzZWxmLCB1aW50MzJfdCBpbmRl eCwgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gdmFsdWUpCit2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gbnBP YmplY3RTZXRJbmRleGVkUHJvcGVydHkodjg6OkxvY2FsPHY4OjpPYmplY3Q+IHNlbGYsIHVpbnQz Ml90IGluZGV4LCB2ODo6TG9jYWw8djg6OlZhbHVlPiB2YWx1ZSwgY29uc3Qgdjg6OkFjY2Vzc29y SW5mbyYgaW5mbykKIHsKICAgICBOUElkZW50aWZpZXIgaWRlbnRpZmllciA9IF9OUE5fR2V0SW50 SWRlbnRpZmllcihpbmRleCk7Ci0gICAgcmV0dXJuIG5wT2JqZWN0U2V0UHJvcGVydHkoc2VsZiwg aWRlbnRpZmllciwgdmFsdWUpOworICAgIHJldHVybiBucE9iamVjdFNldFByb3BlcnR5KHNlbGYs IGlkZW50aWZpZXIsIHZhbHVlLCBpbmZvLkdldElzb2xhdGUoKSk7CiB9CiAKIHY4OjpIYW5kbGU8 djg6OkFycmF5PiBucE9iamVjdFByb3BlcnR5RW51bWVyYXRvcihjb25zdCB2ODo6QWNjZXNzb3JJ bmZvJiBpbmZvLCBib29sIG5hbWVkUHJvcGVydHkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy92OC9WOE5QT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9W OE5QT2JqZWN0LmgKaW5kZXggODMyZDY0OTFjOTYzZTg0ZjdiY2JlMzA4OGNhMGNmYWE2N2FiNjJi MC4uN2MwNWIwZGVjNWMwNWUxYmEzZGVmMmRjZjIzNzBhODA2ZTQyY2NiZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhOUE9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L1Y4TlBPYmplY3QuaApAQCAtNDUsMTQgKzQ1LDE0IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIC8vIEdldHRlcnMKIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBucE9iamVjdE5h bWVkUHJvcGVydHlHZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIGNvbnN0IHY4OjpB Y2Nlc3NvckluZm8mKTsKIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBucE9iamVjdEluZGV4ZWRQcm9w ZXJ0eUdldHRlcih1aW50MzJfdCBpbmRleCwgY29uc3Qgdjg6OkFjY2Vzc29ySW5mbyYpOwotdjg6 OkhhbmRsZTx2ODo6VmFsdWU+IG5wT2JqZWN0R2V0TmFtZWRQcm9wZXJ0eSh2ODo6TG9jYWw8djg6 Ok9iamVjdD4gc2VsZiwgdjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUpOwotdjg6OkhhbmRsZTx2 ODo6VmFsdWU+IG5wT2JqZWN0R2V0SW5kZXhlZFByb3BlcnR5KHY4OjpMb2NhbDx2ODo6T2JqZWN0 PiBzZWxmLCB1aW50MzJfdCBpbmRleCk7Cit2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gbnBPYmplY3RH ZXROYW1lZFByb3BlcnR5KHY4OjpMb2NhbDx2ODo6T2JqZWN0PiBzZWxmLCB2ODo6TG9jYWw8djg6 OlN0cmluZz4gbmFtZSwgY29uc3Qgdjg6OkFjY2Vzc29ySW5mbyYpOwordjg6OkhhbmRsZTx2ODo6 VmFsdWU+IG5wT2JqZWN0R2V0SW5kZXhlZFByb3BlcnR5KHY4OjpMb2NhbDx2ODo6T2JqZWN0PiBz ZWxmLCB1aW50MzJfdCBpbmRleCwgY29uc3Qgdjg6OkFjY2Vzc29ySW5mbyYpOwogCiAvLyBTZXR0 ZXJzCiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gbnBPYmplY3ROYW1lZFByb3BlcnR5U2V0dGVyKHY4 OjpMb2NhbDx2ODo6U3RyaW5nPiBuYW1lLCB2ODo6TG9jYWw8djg6OlZhbHVlPiwgY29uc3Qgdjg6 OkFjY2Vzc29ySW5mbyYpOwogdjg6OkhhbmRsZTx2ODo6VmFsdWU+IG5wT2JqZWN0SW5kZXhlZFBy b3BlcnR5U2V0dGVyKHVpbnQzMl90IGluZGV4LCBjb25zdCB2ODo6QWNjZXNzb3JJbmZvJik7Ci12 ODo6SGFuZGxlPHY4OjpWYWx1ZT4gbnBPYmplY3RTZXROYW1lZFByb3BlcnR5KHY4OjpMb2NhbDx2 ODo6T2JqZWN0PiBzZWxmLCB2ODo6TG9jYWw8djg6OlN0cmluZz4gbmFtZSwgdjg6OkxvY2FsPHY4 OjpWYWx1ZT4pOwotdjg6OkhhbmRsZTx2ODo6VmFsdWU+IG5wT2JqZWN0U2V0SW5kZXhlZFByb3Bl cnR5KHY4OjpMb2NhbDx2ODo6T2JqZWN0PiBzZWxmLCB1aW50MzJfdCBpbmRleCwgdjg6OkxvY2Fs PHY4OjpWYWx1ZT4pOwordjg6OkhhbmRsZTx2ODo6VmFsdWU+IG5wT2JqZWN0U2V0TmFtZWRQcm9w ZXJ0eSh2ODo6TG9jYWw8djg6Ok9iamVjdD4gc2VsZiwgdjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5h bWUsIHY4OjpMb2NhbDx2ODo6VmFsdWU+LCBjb25zdCB2ODo6QWNjZXNzb3JJbmZvJik7Cit2ODo6 SGFuZGxlPHY4OjpWYWx1ZT4gbnBPYmplY3RTZXRJbmRleGVkUHJvcGVydHkodjg6OkxvY2FsPHY4 OjpPYmplY3Q+IHNlbGYsIHVpbnQzMl90IGluZGV4LCB2ODo6TG9jYWw8djg6OlZhbHVlPiwgY29u c3Qgdjg6OkFjY2Vzc29ySW5mbyYpOwogCiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gbnBPYmplY3RJ bnZva2VEZWZhdWx0SGFuZGxlcihjb25zdCB2ODo6QXJndW1lbnRzJik7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxQbHVnSW5FbGVtZW50Q3Vz dG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxQbHVnSW5F bGVtZW50Q3VzdG9tLmNwcAppbmRleCAxYzExNGM1ZjM1MGNjNDIyZDEwNDE2Y2IzYjJiMjk1ZTNk M2U0ZTUxLi43MmI4NWIyNGZkODE1ZTM4MjQzM2EzMzZlNDZlYWFkZjNlZDAyYjk4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MUGx1Z0luRWxlbWVu dEN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRN TFBsdWdJbkVsZW1lbnRDdXN0b20uY3BwCkBAIC01Niw3ICs1Niw3IEBAIHN0YXRpYyB2ODo6SGFu ZGxlPHY4OjpWYWx1ZT4gbnBPYmplY3ROYW1lZEdldHRlcih2ODo6TG9jYWw8djg6OlN0cmluZz4g bmFtZSwgY29uCiAgICAgaWYgKGluc3RhbmNlLklzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIG5v dEhhbmRsZWRCeUludGVyY2VwdG9yKCk7CiAKLSAgICByZXR1cm4gbnBPYmplY3RHZXROYW1lZFBy b3BlcnR5KGluc3RhbmNlLCBuYW1lKTsKKyAgICByZXR1cm4gbnBPYmplY3RHZXROYW1lZFByb3Bl cnR5KGluc3RhbmNlLCBuYW1lLCBpbmZvKTsKIH0KIAogdGVtcGxhdGUgPGNsYXNzIEM+CkBAIC03 MSw3ICs3MSw3IEBAIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gbnBPYmplY3ROYW1lZFNl dHRlcih2ODo6TG9jYWw8djg6OlN0cmluZz4gbmFtZSwgdjg6CiAgICAgaWYgKGluc3RhbmNlLklz RW1wdHkoKSkKICAgICAgICAgcmV0dXJuIG5vdEhhbmRsZWRCeUludGVyY2VwdG9yKCk7CiAKLSAg ICByZXR1cm4gbnBPYmplY3RTZXROYW1lZFByb3BlcnR5KGluc3RhbmNlLCBuYW1lLCB2YWx1ZSk7 CisgICAgcmV0dXJuIG5wT2JqZWN0U2V0TmFtZWRQcm9wZXJ0eShpbnN0YW5jZSwgbmFtZSwgdmFs dWUsIGluZm8pOwogfQogCiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhIVE1MQXBwbGV0RWxlbWVu dDo6bmFtZWRQcm9wZXJ0eUdldHRlcih2ODo6TG9jYWw8djg6OlN0cmluZz4gbmFtZSwgY29uc3Qg djg6OkFjY2Vzc29ySW5mbyYgaW5mbykKQEAgLTE0MSw3ICsxNDEsNyBAQCB2ODo6SGFuZGxlPHY4 OjpWYWx1ZT4gbnBPYmplY3RJbmRleGVkR2V0dGVyKHVpbnQzMl90IGluZGV4LCBjb25zdCB2ODo6 QWNjZXNzb3JJbgogICAgIGlmIChpbnN0YW5jZS5Jc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBu b3RIYW5kbGVkQnlJbnRlcmNlcHRvcigpOwogCi0gICAgcmV0dXJuIG5wT2JqZWN0R2V0SW5kZXhl ZFByb3BlcnR5KGluc3RhbmNlLCBpbmRleCk7CisgICAgcmV0dXJuIG5wT2JqZWN0R2V0SW5kZXhl ZFByb3BlcnR5KGluc3RhbmNlLCBpbmRleCwgaW5mbyk7CiB9CiAKIHRlbXBsYXRlIDxjbGFzcyBD PgpAQCAtMTU3LDcgKzE1Nyw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBucE9iamVjdEluZGV4 ZWRTZXR0ZXIodWludDMyX3QgaW5kZXgsIHY4OjpMb2NhbDx2ODo6VmFsdWU+CiAgICAgaWYgKGlu c3RhbmNlLklzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIG5vdEhhbmRsZWRCeUludGVyY2VwdG9y KCk7CiAKLSAgICByZXR1cm4gbnBPYmplY3RTZXRJbmRleGVkUHJvcGVydHkoaW5zdGFuY2UsIGlu ZGV4LCB2YWx1ZSk7CisgICAgcmV0dXJuIG5wT2JqZWN0U2V0SW5kZXhlZFByb3BlcnR5KGluc3Rh bmNlLCBpbmRleCwgdmFsdWUsIGluZm8pOwogfQogCiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhI VE1MQXBwbGV0RWxlbWVudDo6aW5kZXhlZFByb3BlcnR5R2V0dGVyKHVpbnQzMl90IGluZGV4LCBj b25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZvKQo=