143730 2015-04-14 15:07:42 -0700 Make creating send rights from shared memory more robust 2015-04-15 10:33:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1085278 0 andersca 2015-04-14 15:07:42 -0700 Make creating send rights from shared memory more robust 1085282 1 250743 andersca 2015-04-14 15:12:24 -0700 Created attachment 250743 Patch 1085323 2 250743 darin 2015-04-14 16:42:23 -0700 Comment on attachment 250743 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=250743&action=review > Source/WebKit2/Platform/SharedMemory.h:104 > + WebCore::MachSendRight createSendRight(Protection) const; Platforms are getting this: error: 'MachSendRight' in namespace 'WebCore' does not name a type I think that means you need to wrap the declaration here in #if OS(DARWIN) like the forward declaration above is. 1085573 3 andersca 2015-04-15 10:33:25 -0700 Committed r182845: <http://trac.webkit.org/changeset/182845> 250743 2015-04-14 15:12:24 -0700 2015-04-14 16:42:23 -0700 Patch bug-143730-20150414151128.patch text/plain 8800 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyODA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWY5NTFiMTRkZWZjOTUw YzkxZGYxNjcyYWUwMGQ5ZGEyOWMyNjE4Yy4uMjgzNmFmZjYzMjIwMmNhMTgzMzMzNWEzMGU1NmMz NDZlNDg1ODU4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTA0LTE0ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBjcmVhdGlu ZyBzZW5kIHJpZ2h0cyBmcm9tIHNoYXJlZCBtZW1vcnkgbW9yZSByb2J1c3QKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzczMAorICAgICAgICByZGFy Oi8vcHJvYmxlbS8xNjU5NTg3MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZCBhIGJvb2wgY29udmVyc2lvbiBvcGVyYXRvciB0byBNYWNoU2VuZFJp Z2h0IGFuZCB0aWR5IHVwIHRoZSBkZWZhdWx0IGNvbnN0cnVjdG9yLgorCisgICAgICAgICogcGxh dGZvcm0vY29jb2EvTWFjaFNlbmRSaWdodC5oOgorICAgICAgICAoV2ViQ29yZTo6TWFjaFNlbmRS aWdodDo6b3BlcmF0b3IgYm9vbCk6CisgICAgICAgIChXZWJDb3JlOjpNYWNoU2VuZFJpZ2h0OjpN YWNoU2VuZFJpZ2h0KTogRGVsZXRlZC4KKwogMjAxNS0wNC0xMyAgU2ltb24gRnJhc2VyICA8c2lt b24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TIFdLMl0gSW50ZXJhY3RpdmUgZWxl bWVudHMgb2YgZGV2ZWxvcGVyLmFwcGxlLmNvbSBhcmUgYnJva2VuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmJi MDcxNDg2YmFmY2Y2ZmExNjg2NDVjMDVjYjQ0YTQyNTIyYmY2Ni4uNjk4YTRhZmNjYmZkYjZkYjhm ODdjYjBjZGNmMzMzZWI5ZTRiY2JlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDE1 LTA0LTE0ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAg TWFrZSBjcmVhdGluZyBzZW5kIHJpZ2h0cyBmcm9tIHNoYXJlZCBtZW1vcnkgbW9yZSByb2J1c3QK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzczMAor ICAgICAgICByZGFyOi8vcHJvYmxlbS8xNjU5NTg3MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2xlYW5zIHVwIGNyZWF0aW9uIG9mIGhhbmRs ZXMgYW5kIHNlbmQgcmlnaHRzIGFuZCBhbHNvIGZpeGVzIGEgYnVnIHdoZXJlIGl0IHdvdWxkIGJl IGltcG9zc2libGUKKyAgICAgICAgdG8gc2VuZCBtb3JlIHRoYW4gMTI4IE1CIG9mIHNoYXJlZCBt ZW1vcnkgaW4gYSBzaW5nbGUgb2JqZWN0LgorCisgICAgICAgICogUGxhdGZvcm0vU2hhcmVkTWVt b3J5Lmg6CisgICAgICAgICogUGxhdGZvcm0vbWFjL1NoYXJlZE1lbW9yeU1hYy5jcHA6CisgICAg ICAgIChXZWJLaXQ6Om1ha2VNZW1vcnlFbnRyeSk6CisgICAgICAgIE5ldyBoZWxwZXIgZnVuY3Rp b24gdGhhdCBjcmVhdGVzIGEgbWVtb3J5IGVudHJ5IHNlbmQgcmlnaHQuIFRoaXMgdXNlcyBNQVBf TUVNX1ZNX1NIQVJFIHdoaWNoIGVuc3VyZXMKKyAgICAgICAgdGhhdCBtZW1vcnkgb2JqZWN0cyBs YXJnZXIgdGhhbiAxMjggTUIgd2lsbCBiZSBoYW5kbGVkIGNvcnJlY3RseS4KKworICAgICAgICAo V2ViS2l0OjpTaGFyZWRNZW1vcnk6OmNyZWF0ZSk6CisgICAgICAgIENhbGwgbWFrZU1lbW9yeUVu dHJ5LgorCisgICAgICAgIChXZWJLaXQ6OlNoYXJlZE1lbW9yeTo6Y3JlYXRlSGFuZGxlKToKKyAg ICAgICAgQ2FsbCBjcmVhdGVTZW5kUmlnaHQuCisKKyAgICAgICAgKFdlYktpdDo6U2hhcmVkTWVt b3J5OjpjcmVhdGVTZW5kUmlnaHQpOgorICAgICAgICBDYWxsIG1ha2VNZW1vcnlFbnRyeSBhbmQg YWRkIHRoZSBuZWNlc3NhcnkgYXNzZXJ0aW9ucy4KKworMjAxNS0wNC0xNCAgQW5kZXJzIENhcmxz c29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIE1vcmUgd29yayBvbiBtYWtpbmcg dGhlIFNoYXJlZE1lbW9yeSBpbnRlcmZhY2UgbW9yZSBzYW5lCiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM3MTgKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvTWFjaFNlbmRSaWdodC5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vY29jb2EvTWFjaFNlbmRSaWdodC5oCmluZGV4IDdjMDJkZjZjYjA3YjJiOTBjZThm YjAyMDc1YTMzMzY2YjNjYjBjZjAuLmM0YmFmMjgzMTAwZjcxYjNlMjVmY2YwZDIxNWVkZThmYWY1 YTk1MmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL01hY2hTZW5k UmlnaHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9NYWNoU2VuZFJpZ2h0 LmgKQEAgLTM1LDE2ICszNSwxNCBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGlj IE1hY2hTZW5kUmlnaHQgYWRvcHQobWFjaF9wb3J0X3QpOwogICAgIFdFQkNPUkVfRVhQT1JUIHN0 YXRpYyBNYWNoU2VuZFJpZ2h0IGNyZWF0ZShtYWNoX3BvcnRfdCk7CiAKLSAgICBNYWNoU2VuZFJp Z2h0KCkKLSAgICAgICAgOiBtX3BvcnQoTUFDSF9QT1JUX05VTEwpCi0gICAgewotICAgIH0KLQor ICAgIE1hY2hTZW5kUmlnaHQoKSA9IGRlZmF1bHQ7CiAgICAgTWFjaFNlbmRSaWdodChNYWNoU2Vu ZFJpZ2h0JiYpOwogICAgIFdFQkNPUkVfRVhQT1JUIH5NYWNoU2VuZFJpZ2h0KCk7CiAKICAgICBX RUJDT1JFX0VYUE9SVCBNYWNoU2VuZFJpZ2h0JiBvcGVyYXRvcj0oTWFjaFNlbmRSaWdodCYmKTsK IAorICAgIGV4cGxpY2l0IG9wZXJhdG9yIGJvb2woKSBjb25zdCB7IHJldHVybiBtX3BvcnQgIT0g TUFDSF9QT1JUX05VTEw7IH0KKwogICAgIG1hY2hfcG9ydF90IHNlbmRSaWdodCgpIGNvbnN0IHsg cmV0dXJuIG1fcG9ydDsgfQogCiAgICAgV0VCQ09SRV9FWFBPUlQgTWFjaFNlbmRSaWdodCBjb3B5 U2VuZFJpZ2h0KCkgY29uc3Q7CkBAIC01Myw3ICs1MSw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAg ICAgZXhwbGljaXQgTWFjaFNlbmRSaWdodChtYWNoX3BvcnRfdCk7CiAKLSAgICBtYWNoX3BvcnRf dCBtX3BvcnQ7CisgICAgbWFjaF9wb3J0X3QgbV9wb3J0IHsgTUFDSF9QT1JUX05VTEwgfTsKIH07 CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL1NoYXJlZE1lbW9yeS5o IGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vU2hhcmVkTWVtb3J5LmgKaW5kZXggMWNjNmVmNDYw NDU1YzI1NTdiYTAyYzc4NDI5NTNmZjc0N2U3OTdmNi4uMzNkNWE1MjQyYzg5MTFkNGVjYmVkZWUx ZDlmOWY1ZTJmNTQ0OWYxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vU2hh cmVkTWVtb3J5LmgKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vU2hhcmVkTWVtb3J5LmgK QEAgLTQwLDYgKzQwLDEyIEBAIGNsYXNzIEFyZ3VtZW50RGVjb2RlcjsKIGNsYXNzIEFyZ3VtZW50 RW5jb2RlcjsKIH0KIAorI2lmIE9TKERBUldJTikKK25hbWVzcGFjZSBXZWJDb3JlIHsKK2NsYXNz IE1hY2hTZW5kUmlnaHQ7Cit9CisjZW5kaWYKKwogbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNz IFNoYXJlZE1lbW9yeSA6IHB1YmxpYyBSZWZDb3VudGVkPFNoYXJlZE1lbW9yeT4gewpAQCAtOTUs NiArMTAxLDggQEAgcHVibGljOgogICAgIHN0YXRpYyB1bnNpZ25lZCBzeXN0ZW1QYWdlU2l6ZSgp OwogCiBwcml2YXRlOgorICAgIFdlYkNvcmU6Ok1hY2hTZW5kUmlnaHQgY3JlYXRlU2VuZFJpZ2h0 KFByb3RlY3Rpb24pIGNvbnN0OworCiAgICAgc2l6ZV90IG1fc2l6ZTsKICAgICB2b2lkKiBtX2Rh dGE7CiAgICAgUHJvdGVjdGlvbiBtX3Byb3RlY3Rpb247CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9QbGF0Zm9ybS9tYWMvU2hhcmVkTWVtb3J5TWFjLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1Bs YXRmb3JtL21hYy9TaGFyZWRNZW1vcnlNYWMuY3BwCmluZGV4IGQxMzIzMTBkNDk5ODA5MGJhYzcz ZTE3NzRhNGQ1NzdiZDYyMjQ3YTAuLmNhZjRmYjQ5YjU0NmZiOTRhMjE0YWQ1YTFlMmE4MDkxMmUw NzJhNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL21hYy9TaGFyZWRNZW1v cnlNYWMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL21hYy9TaGFyZWRNZW1vcnlN YWMuY3BwCkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSAiQXJndW1lbnRFbmNvZGVyLmgiCiAj aW5jbHVkZSAiQXJndW1lbnRzLmgiCiAjaW5jbHVkZSAiTWFjaFBvcnQuaCIKKyNpbmNsdWRlIDxX ZWJDb3JlL01hY2hTZW5kUmlnaHQuaD4KICNpbmNsdWRlIDxXZWJDb3JlL01hY2hWTVNQSS5oPgog I2luY2x1ZGUgPG1hY2gvbWFjaF9lcnJvci5oPgogI2luY2x1ZGUgPG1hY2gvbWFjaF9wb3J0Lmg+ CkBAIC0xMzEsMzEgKzEzMiwzNCBAQCBzdGF0aWMgaW5saW5lIHZtX3Byb3RfdCBtYWNoUHJvdGVj dGlvbihTaGFyZWRNZW1vcnk6OlByb3RlY3Rpb24gcHJvdGVjdGlvbikKICAgICByZXR1cm4gVk1f UFJPVF9OT05FOwogfQogCi1SZWZQdHI8U2hhcmVkTWVtb3J5PiBTaGFyZWRNZW1vcnk6OmNyZWF0 ZSh2b2lkKiBkYXRhLCBzaXplX3Qgc2l6ZSwgUHJvdGVjdGlvbiBwcm90ZWN0aW9uKQorc3RhdGlj IFdlYkNvcmU6Ok1hY2hTZW5kUmlnaHQgbWFrZU1lbW9yeUVudHJ5KHNpemVfdCBzaXplLCB2bV9v ZmZzZXRfdCBvZmZzZXQsIFNoYXJlZE1lbW9yeTo6UHJvdGVjdGlvbiBwcm90ZWN0aW9uLCBtYWNo X3BvcnRfdCBwYXJlbnRFbnRyeSkKIHsKLSAgICBBU1NFUlQoc2l6ZSk7Ci0gICAgCi0gICAgLy8g Q3JlYXRlIGEgTWFjaCBwb3J0IHRoYXQgcmVwcmVzZW50cyB0aGUgc2hhcmVkIG1lbW9yeS4KLSAg ICBtYWNoX3BvcnRfdCBwb3J0OwogICAgIG1lbW9yeV9vYmplY3Rfc2l6ZV90IG1lbW9yeU9iamVj dFNpemUgPSByb3VuZF9wYWdlKHNpemUpOwotICAgIGtlcm5fcmV0dXJuX3Qga3IgPSBtYWNoX21h a2VfbWVtb3J5X2VudHJ5XzY0KG1hY2hfdGFza19zZWxmKCksICZtZW1vcnlPYmplY3RTaXplLCB0 b1ZNQWRkcmVzcyhkYXRhKSwgbWFjaFByb3RlY3Rpb24ocHJvdGVjdGlvbikgfCBWTV9QUk9UX0lT X01BU0ssICZwb3J0LCBNQUNIX1BPUlRfTlVMTCk7Ci0gICAgCisKKyAgICBtYWNoX3BvcnRfdCBw b3J0OworICAgIGtlcm5fcmV0dXJuX3Qga3IgPSBtYWNoX21ha2VfbWVtb3J5X2VudHJ5XzY0KG1h Y2hfdGFza19zZWxmKCksICZtZW1vcnlPYmplY3RTaXplLCBvZmZzZXQsIG1hY2hQcm90ZWN0aW9u KHByb3RlY3Rpb24pIHwgVk1fUFJPVF9JU19NQVNLIHwgTUFQX01FTV9WTV9TSEFSRSwgJnBvcnQs IHBhcmVudEVudHJ5KTsKICAgICBpZiAoa3IgIT0gS0VSTl9TVUNDRVNTKSB7CiAgICAgICAgIExP R19FUlJPUigiRmFpbGVkIHRvIGNyZWF0ZSBhIG1hY2ggcG9ydCBmb3Igc2hhcmVkIG1lbW9yeS4g JXMgKCV4KSIsIG1hY2hfZXJyb3Jfc3RyaW5nKGtyKSwga3IpOwotICAgICAgICByZXR1cm4gMDsK KyAgICAgICAgcmV0dXJuIHsgfTsKICAgICB9CiAKLSAgICBpZiAobWVtb3J5T2JqZWN0U2l6ZSA8 IHJvdW5kX3BhZ2Uoc2l6ZSkpIHsKLSAgICAgICAgLy8gVGhlcmUgaXMgYSBsaW1pdCBvbiBob3cg bGFyZ2UgYSBzaGFyZWQgbWVtb3J5IG9iamVjdCBjYW4gYmUgKHNlZSA8cmRhcjovL3Byb2JsZW0v MTY1OTU4NzA+KS4KLSAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gY3JlYXRlIGEgbWFjaCBw b3J0IGZvciBzaGFyZWQgbWVtb3J5IG9mIHNpemUgJWx1IChnb3QgJWxsdSBieXRlcykuIiwgcm91 bmRfcGFnZShzaXplKSwgbWVtb3J5T2JqZWN0U2l6ZSk7Ci0gICAgICAgIG1hY2hfcG9ydF9kZWFs bG9jYXRlKG1hY2hfdGFza19zZWxmKCksIHBvcnQpOwotICAgICAgICByZXR1cm4gMDsKLSAgICB9 CisgICAgUkVMRUFTRV9BU1NFUlQobWVtb3J5T2JqZWN0U2l6ZSA+PSBzaXplKTsKKworICAgIHJl dHVybiBXZWJDb3JlOjpNYWNoU2VuZFJpZ2h0OjphZG9wdChwb3J0KTsKK30KKworUmVmUHRyPFNo YXJlZE1lbW9yeT4gU2hhcmVkTWVtb3J5OjpjcmVhdGUodm9pZCogZGF0YSwgc2l6ZV90IHNpemUs IFByb3RlY3Rpb24gcHJvdGVjdGlvbikKK3sKKyAgICBBU1NFUlQoc2l6ZSk7CisKKyAgICBhdXRv IHNlbmRSaWdodCA9IG1ha2VNZW1vcnlFbnRyeShzaXplLCB0b1ZNQWRkcmVzcyhkYXRhKSwgcHJv dGVjdGlvbiwgTUFDSF9QT1JUX05VTEwpOworICAgIGlmICghc2VuZFJpZ2h0KQorICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKIAogICAgIFJlZlB0cjxTaGFyZWRNZW1vcnk+IHNoYXJlZE1lbW9yeShh ZG9wdFJlZihuZXcgU2hhcmVkTWVtb3J5KSk7CiAgICAgc2hhcmVkTWVtb3J5LT5tX3NpemUgPSBz aXplOwogICAgIHNoYXJlZE1lbW9yeS0+bV9kYXRhID0gbnVsbHB0cjsKLSAgICBzaGFyZWRNZW1v cnktPm1fcG9ydCA9IHBvcnQ7CisgICAgc2hhcmVkTWVtb3J5LT5tX3BvcnQgPSBzZW5kUmlnaHQu bGVha1NlbmRSaWdodCgpOwogICAgIHNoYXJlZE1lbW9yeS0+bV9wcm90ZWN0aW9uID0gcHJvdGVj dGlvbjsKIAogICAgIHJldHVybiBzaGFyZWRNZW1vcnkucmVsZWFzZSgpOwpAQCAtMTk4LDM4ICsy MDIsMTUgQEAgU2hhcmVkTWVtb3J5Ojp+U2hhcmVkTWVtb3J5KCkKICAgICAKIGJvb2wgU2hhcmVk TWVtb3J5OjpjcmVhdGVIYW5kbGUoSGFuZGxlJiBoYW5kbGUsIFByb3RlY3Rpb24gcHJvdGVjdGlv bikKIHsKLSAgICBBU1NFUlQobV9wcm90ZWN0aW9uID09IHByb3RlY3Rpb24gfHwgbV9wcm90ZWN0 aW9uID09IFByb3RlY3Rpb246OlJlYWRXcml0ZSAmJiBwcm90ZWN0aW9uID09IFByb3RlY3Rpb246 OlJlYWRPbmx5KTsKLQogICAgIEFTU0VSVCghaGFuZGxlLm1fcG9ydCk7CiAgICAgQVNTRVJUKCFo YW5kbGUubV9zaXplKTsKIAotICAgIG1lbW9yeV9vYmplY3Rfc2l6ZV90IHNpemUgPSByb3VuZF9w YWdlKG1fc2l6ZSk7Ci0KLSAgICBtYWNoX3BvcnRfdCBwb3J0OwotCi0gICAgaWYgKHByb3RlY3Rp b24gPT0gbV9wcm90ZWN0aW9uICYmIG1fcG9ydCkgewotICAgICAgICAvLyBKdXN0IHJlLXVzZSB0 aGUgcG9ydCB3ZSBoYXZlLgotICAgICAgICBwb3J0ID0gbV9wb3J0OwotICAgICAgICBpZiAobWFj aF9wb3J0X21vZF9yZWZzKG1hY2hfdGFza19zZWxmKCksIHBvcnQsIE1BQ0hfUE9SVF9SSUdIVF9T RU5ELCAxKSAhPSBLRVJOX1NVQ0NFU1MpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAg fSBlbHNlIHsKLSAgICAgICAgQVNTRVJUKG1fZGF0YSk7Ci0gICAgICAgIG1hY2hfdm1fYWRkcmVz c190IGFkZHJlc3MgPSB0b1ZNQWRkcmVzcyhtX2RhdGEpOwotCi0gICAgICAgIC8vIENyZWF0ZSBh IG1hY2ggcG9ydCB0aGF0IHJlcHJlc2VudHMgdGhlIHNoYXJlZCBtZW1vcnkuCi0gICAgICAgIGtl cm5fcmV0dXJuX3Qga3IgPSBtYWNoX21ha2VfbWVtb3J5X2VudHJ5XzY0KG1hY2hfdGFza19zZWxm KCksICZzaXplLCBhZGRyZXNzLCBtYWNoUHJvdGVjdGlvbihwcm90ZWN0aW9uKSwgJnBvcnQsIE1B Q0hfUE9SVF9OVUxMKTsKLSAgICAgICAgaWYgKGtyICE9IEtFUk5fU1VDQ0VTUykKLSAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKLQotICAgICAgICBBU1NFUlQoc2l6ZSA+PSByb3VuZF9wYWdlKG1f c2l6ZSkpOwotICAgICAgICBpZiAoc2l6ZSA8IHJvdW5kX3BhZ2UobV9zaXplKSkgewotICAgICAg ICAgICAgbWFjaF9wb3J0X2RlYWxsb2NhdGUobWFjaF90YXNrX3NlbGYoKSwgcG9ydCk7Ci0gICAg ICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIH0KLSAgICB9CisgICAgYXV0byBzZW5kUmln aHQgPSBjcmVhdGVTZW5kUmlnaHQocHJvdGVjdGlvbik7CisgICAgaWYgKCFzZW5kUmlnaHQpCisg ICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGhhbmRsZS5tX3BvcnQgPSBwb3J0OwotICAgIGhh bmRsZS5tX3NpemUgPSBzaXplOworICAgIGhhbmRsZS5tX3BvcnQgPSBzZW5kUmlnaHQubGVha1Nl bmRSaWdodCgpOworICAgIGhhbmRsZS5tX3NpemUgPSByb3VuZF9wYWdlKG1fc2l6ZSk7CiAKICAg ICByZXR1cm4gdHJ1ZTsKIH0KQEAgLTIzOSw0ICsyMjAsMTYgQEAgdW5zaWduZWQgU2hhcmVkTWVt b3J5OjpzeXN0ZW1QYWdlU2l6ZSgpCiAgICAgcmV0dXJuIHZtX3BhZ2Vfc2l6ZTsKIH0KIAorV2Vi Q29yZTo6TWFjaFNlbmRSaWdodCBTaGFyZWRNZW1vcnk6OmNyZWF0ZVNlbmRSaWdodChQcm90ZWN0 aW9uIHByb3RlY3Rpb24pIGNvbnN0Cit7CisgICAgQVNTRVJUKG1fcHJvdGVjdGlvbiA9PSBwcm90 ZWN0aW9uIHx8IG1fcHJvdGVjdGlvbiA9PSBQcm90ZWN0aW9uOjpSZWFkV3JpdGUgJiYgcHJvdGVj dGlvbiA9PSBQcm90ZWN0aW9uOjpSZWFkT25seSk7CisgICAgQVNTRVJUKCEhbV9kYXRhIF4gISFt X3BvcnQpOworCisgICAgaWYgKG1fcG9ydCAmJiBtX3Byb3RlY3Rpb24gPT0gcHJvdGVjdGlvbikK KyAgICAgICAgcmV0dXJuIFdlYkNvcmU6Ok1hY2hTZW5kUmlnaHQ6OmNyZWF0ZShtX3BvcnQpOwor CisgICAgQVNTRVJUKG1fZGF0YSk7CisgICAgcmV0dXJuIG1ha2VNZW1vcnlFbnRyeShtX3NpemUs IHRvVk1BZGRyZXNzKG1fZGF0YSksIHByb3RlY3Rpb24sIE1BQ0hfUE9SVF9OVUxMKTsKK30KKwog fSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg==