154032 2016-02-09 08:57:35 -0800 Modern IDB: IDBOpenDBRequests leak 2016-02-09 09:40:48 -0800 1 1 1 Unclassified WebKit WebCore Misc. Safari 9 Unspecified Unspecified RESOLVED FIXED P2 Normal --- 149117 154015 1 beidson beidson achristensen commit-queue oldest_to_newest 1163194 0 beidson 2016-02-09 08:57:35 -0800 Modern IDB: IDBOpenDBRequests leak There's a ref cycle between IDBTransaction and IDBOpenDBRequest. Breaking IDBTransaction's ref to the request is easy - *IF* the request is able to potentially manage the end of its own lifetime, which is tied to its final event dispatch. Doing that requires a new Event class that holds the final ref to the request. 1163205 1 270934 beidson 2016-02-09 09:21:59 -0800 Created attachment 270934 Patch v1 1163215 2 270934 commit-queue 2016-02-09 09:40:45 -0800 Comment on attachment 270934 Patch v1 Clearing flags on attachment: 270934 Committed r196313: <http://trac.webkit.org/changeset/196313> 1163216 3 commit-queue 2016-02-09 09:40:48 -0800 All reviewed patches have been landed. Closing bug. 270934 2016-02-09 09:21:59 -0800 2016-02-09 09:40:45 -0800 Patch v1 patch text/plain 14323 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHMudHh0IGIvU291cmNlL1dlYkNv cmUvQ01ha2VMaXN0cy50eHQKaW5kZXggYzNiMDdlYS4uOTU5MzcyNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ01ha2VMaXN0cy50eHQKKysrIGIvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0 cy50eHQKQEAgLTg0Niw2ICs4NDYsNyBAQCBzZXQoV2ViQ29yZV9TT1VSQ0VTCiAgICAgTW9kdWxl cy9pbmRleGVkZGIvSURCT2JqZWN0U3RvcmUuY3BwCiAgICAgTW9kdWxlcy9pbmRleGVkZGIvSURC T3BlbkRCUmVxdWVzdC5jcHAKICAgICBNb2R1bGVzL2luZGV4ZWRkYi9JREJSZXF1ZXN0LmNwcAor ICAgIE1vZHVsZXMvaW5kZXhlZGRiL0lEQlJlcXVlc3RDb21wbGV0aW9uRXZlbnQuY3BwCiAgICAg TW9kdWxlcy9pbmRleGVkZGIvSURCVHJhbnNhY3Rpb24uY3BwCiAgICAgTW9kdWxlcy9pbmRleGVk ZGIvSURCVmVyc2lvbkNoYW5nZUV2ZW50LmNwcAogICAgIE1vZHVsZXMvaW5kZXhlZGRiL1dvcmtl ckdsb2JhbFNjb3BlSW5kZXhlZERhdGFiYXNlLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGE4ZDRlNjQuLjAw MDQwZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMiBAQAorMjAxNi0wMi0wOSAgQnJhZHkgRWlk c29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgTW9kZXJuIElEQjogSURCT3BlbkRC UmVxdWVzdHMgbGVhay4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE1NDAzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cyAoQ3VycmVudGx5IHVudGVzdGFibGUpLgorCisgICAgICAgICog Q01ha2VMaXN0cy50eHQ6CisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qOgorCisgICAgICAgIEFkZCBhIHNpbXBsZSBFdmVudCBzdWJjbGFzcyB0aGF0IGhvbGRzIGEg cmVmIHRvIGFuIElEQlJlcXVlc3QsIHRvIG1ha2Ugc3VyZSB0aGF0IHdlCisgICAgICAgIGRyb3Ag dGhlIGxhc3QgcmVmIHRvIHRoZSByZXF1ZXN0IGFmdGVyIGl0cyBsYXN0IGV2ZW50IGZpcmVzIG9y IGlzIG90aGVyd2lzZSBkZXN0cm95ZWQ6CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURC UmVxdWVzdENvbXBsZXRpb25FdmVudC5jcHA6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6SURC UmVxdWVzdENvbXBsZXRpb25FdmVudDo6SURCUmVxdWVzdENvbXBsZXRpb25FdmVudCk6CisgICAg ICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCUmVxdWVzdENvbXBsZXRpb25FdmVudC5oOiBBZGRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OklEQlJlcXVlc3RDb21wbGV0aW9uRXZlbnQ6OmNyZWF0ZSk6 CisKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURCT3BlbkRCUmVxdWVzdElt cGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCQ2xpZW50OjpJREJPcGVuREJSZXF1ZXN0Ojpv bkVycm9yKTogSURCUmVxdWVzdENvbXBsZXRpb25FdmVudCBpbnN0ZWFkIG9mIEV2ZW50LgorICAg ICAgICAoV2ViQ29yZTo6SURCQ2xpZW50OjpJREJPcGVuREJSZXF1ZXN0OjpmaXJlU3VjY2Vzc0Fm dGVyVmVyc2lvbkNoYW5nZUNvbW1pdCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6SURCQ2xp ZW50OjpJREJPcGVuREJSZXF1ZXN0OjpmaXJlRXJyb3JBZnRlclZlcnNpb25DaGFuZ2VDb21wbGV0 aW9uKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpJREJDbGllbnQ6OklEQk9wZW5EQlJlcXVl c3Q6Om9uU3VjY2Vzcyk6IERpdHRvLgorCisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvY2xp ZW50L0lEQlRyYW5zYWN0aW9uSW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJDbGllbnQ6 OklEQlRyYW5zYWN0aW9uOjpkaXNwYXRjaEV2ZW50KTogQWZ0ZXIgc2V0dGluZyB1cCB0aGUgcmVx dWVzdCdzIAorICAgICAgICAgIGNvbXBsZXRpb24gZXZlbnQgdG8gZmlyZSwgY2xlYXIgdGhlIGJh Y2stcmVmIHRvIHRoZSByZXF1ZXN0LgorCiAyMDE2LTAyLTA4ICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBXZWJLaXRXZWJWaWV3IHNo b3VsZCBzZW5kIGNyb3NzaW5nIGV2ZW50cyB0byB0aGUgV2ViUHJvY2VzcwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCUmVxdWVzdENvbXBsZXRpb25FdmVu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJSZXF1ZXN0Q29tcGxl dGlvbkV2ZW50LmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wYmVjNmUz Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURC UmVxdWVzdENvbXBsZXRpb25FdmVudC5jcHAKQEAgLTAsMCArMSw0MSBAQAorLyoKKyAqIENvcHly aWdodCAoQykgMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVk aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3 aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMg b2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy LgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRo ZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMg YW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24g YW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisg KgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09O VFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFO VElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJS QU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisg KiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9S IElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1Qs IElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFN QUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBT VUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklU UzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFO WSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJ QUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICog QVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4g SUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisK KyNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJJREJSZXF1ZXN0Q29tcGxldGlvbkV2ZW50 LmgiCisKKyNpZiBFTkFCTEUoSU5ERVhFRF9EQVRBQkFTRSkKKworbmFtZXNwYWNlIFdlYkNvcmUg eworCitJREJSZXF1ZXN0Q29tcGxldGlvbkV2ZW50OjpJREJSZXF1ZXN0Q29tcGxldGlvbkV2ZW50 KGNvbnN0IEF0b21pY1N0cmluZyYgdHlwZSwgYm9vbCBjYW5CdWJibGUsIGJvb2wgY2FuY2VsYWJs ZSwgSURCQ2xpZW50OjpJREJSZXF1ZXN0JiByZXF1ZXN0KQorICAgIDogRXZlbnQodHlwZSwgY2Fu QnViYmxlLCBjYW5jZWxhYmxlKQorICAgICwgbV9yZXF1ZXN0KHJlcXVlc3QpCit7Cit9CisKK30g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKKworI2VuZGlmIC8vIEVOQUJMRShJTkRFWEVEX0RBVEFCQVNF KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCUmVxdWVz dENvbXBsZXRpb25FdmVudC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURC UmVxdWVzdENvbXBsZXRpb25FdmVudC5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAuLjBkNDBlMjQKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9JREJSZXF1ZXN0Q29tcGxldGlvbkV2ZW50LmgKQEAgLTAsMCArMSw1MyBAQAorLyoK KyAqIENvcHlyaWdodCAoQykgMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisg KgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQg dGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3Ry aWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAor ICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVw cm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNv bmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3Vt ZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmli dXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFO RCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJ RUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1Q TElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJU SUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBM RSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwg SU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVF TlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5U IE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwg T1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQg QU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwg U1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJX SVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdB UkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgorICovCisKKyNpZm5kZWYgSURCUmVxdWVzdENvbXBsZXRpb25FdmVudF9oCisjZGVmaW5lIElE QlJlcXVlc3RDb21wbGV0aW9uRXZlbnRfaAorCisjaWYgRU5BQkxFKElOREVYRURfREFUQUJBU0Up CisKKyNpbmNsdWRlICJFdmVudC5oIgorI2luY2x1ZGUgIklEQlJlcXVlc3RJbXBsLmgiCisKK25h bWVzcGFjZSBXZWJDb3JlIHsKKworY2xhc3MgSURCUmVxdWVzdENvbXBsZXRpb25FdmVudCA6IHB1 YmxpYyBFdmVudCB7CitwdWJsaWM6CisgICAgc3RhdGljIFJlZjxFdmVudD4gY3JlYXRlKGNvbnN0 IEF0b21pY1N0cmluZyYgdHlwZSwgYm9vbCBjYW5CdWJibGUsIGJvb2wgY2FuY2VsYWJsZSwgSURC Q2xpZW50OjpJREJSZXF1ZXN0JiByZXF1ZXN0KQorICAgIHsKKyAgICAgICAgcmV0dXJuIGFkb3B0 UmVmKCpuZXcgSURCUmVxdWVzdENvbXBsZXRpb25FdmVudCh0eXBlLCBjYW5CdWJibGUsIGNhbmNl bGFibGUsIHJlcXVlc3QpKTsKKyAgICB9CisKK3ByaXZhdGU6CisgICAgSURCUmVxdWVzdENvbXBs ZXRpb25FdmVudChjb25zdCBBdG9taWNTdHJpbmcmIHR5cGUsIGJvb2wgY2FuQnViYmxlLCBib29s IGNhbmNlbGFibGUsIElEQkNsaWVudDo6SURCUmVxdWVzdCYpOworCisgICAgUmVmPElEQkNsaWVu dDo6SURCUmVxdWVzdD4gbV9yZXF1ZXN0OworfTsKKworCit9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl CisKKyNlbmRpZiAvLyBFTkFCTEUoSU5ERVhFRF9EQVRBQkFTRSkKKyNlbmRpZiAvLyBJREJSZXF1 ZXN0Q29tcGxldGlvbkV2ZW50X2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL2NsaWVudC9JREJPcGVuREJSZXF1ZXN0SW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURCT3BlbkRCUmVxdWVzdEltcGwuY3BwCmluZGV4 IDEwYTY2MjQuLmMxOWI3MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL2NsaWVudC9JREJPcGVuREJSZXF1ZXN0SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQk9wZW5EQlJlcXVlc3RJbXBsLmNwcApAQCAt MzAsNiArMzAsNyBAQAogCiAjaW5jbHVkZSAiSURCRGF0YWJhc2VJbXBsLmgiCiAjaW5jbHVkZSAi SURCRXJyb3IuaCIKKyNpbmNsdWRlICJJREJSZXF1ZXN0Q29tcGxldGlvbkV2ZW50LmgiCiAjaW5j bHVkZSAiSURCUmVzdWx0RGF0YS5oIgogI2luY2x1ZGUgIklEQlRyYW5zYWN0aW9uSW1wbC5oIgog I2luY2x1ZGUgIklEQlZlcnNpb25DaGFuZ2VFdmVudEltcGwuaCIKQEAgLTY1LDcgKzY2LDcgQEAg SURCT3BlbkRCUmVxdWVzdDo6fklEQk9wZW5EQlJlcXVlc3QoKQogdm9pZCBJREJPcGVuREJSZXF1 ZXN0OjpvbkVycm9yKGNvbnN0IElEQlJlc3VsdERhdGEmIGRhdGEpCiB7CiAgICAgbV9kb21FcnJv ciA9IERPTUVycm9yOjpjcmVhdGUoZGF0YS5lcnJvcigpLm5hbWUoKSk7Ci0gICAgZW5xdWV1ZUV2 ZW50KEV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLmVycm9yRXZlbnQsIHRydWUsIHRydWUpKTsK KyAgICBlbnF1ZXVlRXZlbnQoSURCUmVxdWVzdENvbXBsZXRpb25FdmVudDo6Y3JlYXRlKGV2ZW50 TmFtZXMoKS5lcnJvckV2ZW50LCB0cnVlLCB0cnVlLCAqdGhpcykpOwogfQogCiB2b2lkIElEQk9w ZW5EQlJlcXVlc3Q6OnZlcnNpb25DaGFuZ2VUcmFuc2FjdGlvbkRpZEZpbmlzaCgpCkBAIC04NCw3 ICs4NSw3IEBAIHZvaWQgSURCT3BlbkRCUmVxdWVzdDo6ZmlyZVN1Y2Nlc3NBZnRlclZlcnNpb25D aGFuZ2VDb21taXQoKQogICAgIEFTU0VSVChtX3Jlc3VsdC0+dHlwZSgpID09IElEQkFueTo6VHlw ZTo6SURCRGF0YWJhc2UpOwogICAgIG1fdHJhbnNhY3Rpb24tPmFkZFJlcXVlc3QoKnRoaXMpOwog Ci0gICAgYXV0byBldmVudCA9IEV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLnN1Y2Nlc3NFdmVu dCwgZmFsc2UsIGZhbHNlKTsKKyAgICBhdXRvIGV2ZW50ID0gSURCUmVxdWVzdENvbXBsZXRpb25F dmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5zdWNjZXNzRXZlbnQsIGZhbHNlLCBmYWxzZSwgKnRo aXMpOwogICAgIG1fb3BlbkRhdGFiYXNlU3VjY2Vzc0V2ZW50ID0gJmV2ZW50LmdldCgpOwogCiAg ICAgZW5xdWV1ZUV2ZW50KFdURk1vdmUoZXZlbnQpKTsKQEAgLTEwMSw3ICsxMDIsNyBAQCB2b2lk IElEQk9wZW5EQlJlcXVlc3Q6OmZpcmVFcnJvckFmdGVyVmVyc2lvbkNoYW5nZUNvbXBsZXRpb24o KQogICAgIG1fcmVzdWx0ID0gSURCQW55OjpjcmVhdGVVbmRlZmluZWQoKTsKIAogICAgIG1fdHJh bnNhY3Rpb24tPmFkZFJlcXVlc3QoKnRoaXMpOwotICAgIGVucXVldWVFdmVudChFdmVudDo6Y3Jl YXRlKGV2ZW50TmFtZXMoKS5lcnJvckV2ZW50LCB0cnVlLCB0cnVlKSk7CisgICAgZW5xdWV1ZUV2 ZW50KElEQlJlcXVlc3RDb21wbGV0aW9uRXZlbnQ6OmNyZWF0ZShldmVudE5hbWVzKCkuZXJyb3JF dmVudCwgdHJ1ZSwgdHJ1ZSwgKnRoaXMpKTsKIH0KIAogYm9vbCBJREJPcGVuREJSZXF1ZXN0Ojpk aXNwYXRjaEV2ZW50KEV2ZW50JiBldmVudCkKQEAgLTEyNSw3ICsxMjYsNyBAQCB2b2lkIElEQk9w ZW5EQlJlcXVlc3Q6Om9uU3VjY2Vzcyhjb25zdCBJREJSZXN1bHREYXRhJiByZXN1bHREYXRhKQog ICAgIG1fcmVzdWx0ID0gSURCQW55OjpjcmVhdGUoV1RGTW92ZShkYXRhYmFzZSkpOwogICAgIG1f cmVhZHlTdGF0ZSA9IElEQlJlcXVlc3RSZWFkeVN0YXRlOjpEb25lOwogCi0gICAgZW5xdWV1ZUV2 ZW50KEV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLnN1Y2Nlc3NFdmVudCwgZmFsc2UsIGZhbHNl KSk7CisgICAgZW5xdWV1ZUV2ZW50KElEQlJlcXVlc3RDb21wbGV0aW9uRXZlbnQ6OmNyZWF0ZShl dmVudE5hbWVzKCkuc3VjY2Vzc0V2ZW50LCBmYWxzZSwgZmFsc2UsICp0aGlzKSk7CiB9CiAKIHZv aWQgSURCT3BlbkRCUmVxdWVzdDo6b25VcGdyYWRlTmVlZGVkKGNvbnN0IElEQlJlc3VsdERhdGEm IHJlc3VsdERhdGEpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9jbGllbnQvSURCVHJhbnNhY3Rpb25JbXBsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL2NsaWVudC9JREJUcmFuc2FjdGlvbkltcGwuY3BwCmluZGV4IGU1Mjg4Y2IuLmMz YTY2YzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVu dC9JREJUcmFuc2FjdGlvbkltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL2NsaWVudC9JREJUcmFuc2FjdGlvbkltcGwuY3BwCkBAIC00NDIsNiArNDQyLDggQEAg Ym9vbCBJREJUcmFuc2FjdGlvbjo6ZGlzcGF0Y2hFdmVudChFdmVudCYgZXZlbnQpCiAgICAgICAg ICAgICBlbHNlCiAgICAgICAgICAgICAgICAgbV9vcGVuREJSZXF1ZXN0LT5maXJlU3VjY2Vzc0Fm dGVyVmVyc2lvbkNoYW5nZUNvbW1pdCgpOwogICAgICAgICB9CisKKyAgICAgICAgbV9vcGVuREJS ZXF1ZXN0ID0gbnVsbHB0cjsKICAgICB9CiAKICAgICByZXR1cm4gcmVzdWx0OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDAxMzk3 ODkuLmY4NGM2YjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2oKQEAgLTE5NzksNiArMTk3OSw4IEBACiAJCTUxNDA1Qzg5MTkwQjAxNDQw MDc1NEY5NCAvKiBTZWxlY3Rpb25SZWN0R2F0aGVyZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDUxNDA1Qzg3MTkwQjAxNDQwMDc1NEY5NCAvKiBTZWxl Y3Rpb25SZWN0R2F0aGVyZXIuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRl LCApOyB9OyB9OwogCQk1MTQxMjk4RTFDNUZEODNBMDA1OUU3MTQgLyogSlNJREJDdXJzb3JXaXRo VmFsdWVDdXN0b20uY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gNTE0MTI5OEQxQzVGRDdFOTAwNTlFNzE0IC8qIEpTSURCQ3Vyc29yV2l0aFZhbHVlQ3Vz dG9tLmNwcCAqLzsgfTsKIAkJNTE0MTI5OTAxQzYwMUFDQzAwNTlFNzE0IC8qIFNjb3BlR3VhcmQu aCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDUxNDEyOThG MUM2MDFBODkwMDU5RTcxNCAvKiBTY29wZUd1YXJkLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVU RVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKKwkJNTE0MTI5OTgxQzY5NzY5MDAwNTlFNzE0IC8qIElE QlJlcXVlc3RDb21wbGV0aW9uRXZlbnQuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gNTE0MTI5OTYxQzY5NzYxNTAwNTlFNzE0IC8qIElEQlJlcXVlc3RD b21wbGV0aW9uRXZlbnQuY3BwICovOyB9OworCQk1MTQxMjk5OTFDNjk3NjkwMDA1OUU3MTQgLyog SURCUmVxdWVzdENvbXBsZXRpb25FdmVudC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gNTE0MTI5OTcxQzY5NzYxNTAwNTlFNzE0IC8qIElEQlJlcXVlc3RD b21wbGV0aW9uRXZlbnQuaCAqLzsgfTsKIAkJNTE0NUIxMDkxQkM0OEUyRTAwRTg2MjE5IC8qIElE QlJlc291cmNlSWRlbnRpZmllci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSA1MTQ1QjEwNzFCQzQ4OTBCMDBFODYyMTkgLyogSURCUmVzb3VyY2VJZGVu dGlmaWVyLmNwcCAqLzsgfTsKIAkJNTE0NUIxMEExQkM0OEUyRTAwRTg2MjE5IC8qIElEQlJlc291 cmNlSWRlbnRpZmllci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gNTE0NUIxMDgxQkM0ODkwQjAwRTg2MjE5IC8qIElEQlJlc291cmNlSWRlbnRpZmllci5o ICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTUxNDg0 NTNFMUJCOUQwN0UwMDZBNzJFRCAvKiBJREJFcnJvci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1MTQ4NDUzQzFCQjlEMDc2MDA2QTcyRUQgLyogSURC RXJyb3IuY3BwICovOyB9OwpAQCAtOTQ3Myw2ICs5NDc1LDggQEAKIAkJNTE0MDVDODcxOTBCMDE0 NDAwNzU0Rjk0IC8qIFNlbGVjdGlvblJlY3RHYXRoZXJlci5oICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jLmg7IHBhdGggPSBTZWxlY3Rpb25SZWN0R2F0aGVyZXIuaDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKIAkJNTE0MTI5OEQxQzVGRDdFOTAwNTlFNzE0IC8qIEpTSURCQ3Vyc29yV2l0aFZh bHVlQ3VzdG9tLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEpTSURC Q3Vyc29yV2l0aFZhbHVlQ3VzdG9tLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ NTE0MTI5OEYxQzYwMUE4OTAwNTlFNzE0IC8qIFNjb3BlR3VhcmQuaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuYy5oOyBwYXRoID0gU2NvcGVHdWFyZC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OworCQk1MTQxMjk5NjFDNjk3NjE1MDA1OUU3MTQgLyogSURCUmVxdWVzdENvbXBsZXRpb25FdmVu dC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBJREJSZXF1ZXN0Q29t cGxldGlvbkV2ZW50LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJNTE0MTI5OTcx QzY5NzYxNTAwNTlFNzE0IC8qIElEQlJlcXVlc3RDb21wbGV0aW9uRXZlbnQuaCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSURCUmVxdWVzdENvbXBsZXRpb25FdmVudC5oOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk1MTQ1QjEwNzFCQzQ4OTBCMDBFODYyMTkgLyogSURC UmVzb3VyY2VJZGVudGlmaWVyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0 aCA9IElEQlJlc291cmNlSWRlbnRpZmllci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTUxNDVCMTA4MUJDNDg5MEIwMEU4NjIxOSAvKiBJREJSZXNvdXJjZUlkZW50aWZpZXIuaCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSURCUmVzb3VyY2VJZGVudGlmaWVyLmg7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTUxNDg0NTNDMUJCOUQwNzYwMDZBNzJFRCAv KiBJREJFcnJvci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBJREJF cnJvci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0xOTQ3OSw2ICsxOTQ4Myw4 IEBACiAJCQkJNTE2NDVCNEUxQjlGODg5QjAwRjc4OUNFIC8qIElEQlJlcXVlc3QuY3BwICovLAog CQkJCTUxNjQ1QjRGMUI5Rjg4OUIwMEY3ODlDRSAvKiBJREJSZXF1ZXN0LmggKi8sCiAJCQkJNTFE NzE5QTMxODExMDZFMDAwMTZEQzUxIC8qIElEQlJlcXVlc3QuaWRsICovLAorCQkJCTUxNDEyOTk2 MUM2OTc2MTUwMDU5RTcxNCAvKiBJREJSZXF1ZXN0Q29tcGxldGlvbkV2ZW50LmNwcCAqLywKKwkJ CQk1MTQxMjk5NzFDNjk3NjE1MDA1OUU3MTQgLyogSURCUmVxdWVzdENvbXBsZXRpb25FdmVudC5o ICovLAogCQkJCTUxMEEzMjZFMTgzMTg0MzEwMDNDNTMyNiAvKiBJREJTZXJ2ZXJDb25uZWN0aW9u LmggKi8sCiAJCQkJNTE2NDVCNTAxQjlGODg5QjAwRjc4OUNFIC8qIElEQlRyYW5zYWN0aW9uLmNw cCAqLywKIAkJCQk1MTY0NUI1MTFCOUY4ODlCMDBGNzg5Q0UgLyogSURCVHJhbnNhY3Rpb24uaCAq LywKQEAgLTI3NjA0LDYgKzI3NjEwLDcgQEAKIAkJCQlGNTVCM0REMjEyNTFGMTJEMDAzRUYyNjkg LyogU2VhcmNoSW5wdXRUeXBlLmggaW4gSGVhZGVycyAqLywKIAkJCQlBQjcxNzA4OTBCMzExODA4 MDAxNzEyM0UgLyogU2VhcmNoUG9wdXBNZW51LmggaW4gSGVhZGVycyAqLywKIAkJCQkwRTcwNThG NDFCQzVDRURBMDA0NUE1MDcgLyogU2VhcmNoUG9wdXBNZW51Q29jb2EuaCBpbiBIZWFkZXJzICov LAorCQkJCTUxNDEyOTk5MUM2OTc2OTAwMDU5RTcxNCAvKiBJREJSZXF1ZXN0Q29tcGxldGlvbkV2 ZW50LmggaW4gSGVhZGVycyAqLywKIAkJCQk5NzZGMzZFQjE0Njg2MjI1MDA1RTkzQjQgLyogU2Vj dXJpdHlDb250ZXh0LmggaW4gSGVhZGVycyAqLywKIAkJCQlCQ0QwRTBGQjBFOTcyQzM1MDAyNjVE RUEgLyogU2VjdXJpdHlPcmlnaW4uaCBpbiBIZWFkZXJzICovLAogCQkJCTUxRTNBQTBCMUI5OEJD QUIwMDM2QUQ4MSAvKiBTZWN1cml0eU9yaWdpbkRhdGEuaCBpbiBIZWFkZXJzICovLApAQCAtMjg4 MTMsNiArMjg4MjAsNyBAQAogCQkJCUZEQjA1MkRGMTU2MUE0MkMwMEI1MDBENiAvKiBBdWRpb1N1 bW1pbmdKdW5jdGlvbi5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlCRTg4RTBEODE3MTVEMkEyMDA2 NThEOTggLyogQXVkaW9UcmFjay5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlCRTg4RTBEQjE3MTVE MkEyMDA2NThEOTggLyogQXVkaW9UcmFja0xpc3QuY3BwIGluIFNvdXJjZXMgKi8sCisJCQkJNTE0 MTI5OTgxQzY5NzY5MDAwNTlFNzE0IC8qIElEQlJlcXVlc3RDb21wbGV0aW9uRXZlbnQuY3BwIGlu IFNvdXJjZXMgKi8sCiAJCQkJQ0RFM0E4NTcxN0Y2MDIwNDAwQzVCRTIwIC8qIEF1ZGlvVHJhY2tQ cml2YXRlQVZGT2JqQy5tbSBpbiBTb3VyY2VzICovLAogCQkJCUNENTRBNzYyMTgwRjlGNzAwMEIw NzZDOSAvKiBBdWRpb1RyYWNrUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5jcHAgaW4gU291cmNl cyAqLywKIAkJCQlGRDMxNjA4QTEyQjAyNkY3MDBDMUEzNTkgLyogQXVkaW9VdGlsaXRpZXMuY3Bw IGluIFNvdXJjZXMgKi8sCg==