115489 2013-05-01 14:16:38 -0700 Begin work on loading items from the local storage database 2013-05-01 15:37:47 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 883529 0 andersca 2013-05-01 14:16:38 -0700 Begin work on loading items from the local storage database 883538 1 200241 andersca 2013-05-01 14:21:14 -0700 Created attachment 200241 Patch 883555 2 200241 kling 2013-05-01 15:28:50 -0700 Comment on attachment 200241 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=200241&action=review > Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp:87 > + m_database.executeCommand("DROP TABLE ItemTable"); We should LOG_ERROR if this fails. 883556 3 andersca 2013-05-01 15:37:47 -0700 Committed r149458: <http://trac.webkit.org/changeset/149458> 200241 2013-05-01 14:21:14 -0700 2013-05-01 15:28:50 -0700 Patch bug-115489-20130501142028.patch text/plain 18122 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5NDQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmIyOGU0ZjJhOWY5YTk5 NWNmYTFmZmE3M2M2NDExMmEzMWMyM2RhOS4uNjJlYjE2YTM0YTVmY2M1N2UwMWQzMmE3M2I1MWI2 MDY0OTAzOTRjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDEzLTA1LTAxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQmVnaW4gd29yayBv biBsb2FkaW5nIGl0ZW1zIGZyb20gdGhlIGxvY2FsIHN0b3JhZ2UgZGF0YWJhc2UKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTQ4OQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEV4cG9ydCBzeW1ib2xzIGFu ZCBTUUxpdGUgaGVhZGVycyBuZWVkZWQuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAg ICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisKKzIwMTMtMDUtMDEg IEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBBZGQgTG9j YWxTdG9yYWdlRGF0YWJhc2UgY2xhc3MKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExNTQ4NgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTViNDdhODEwZDk0ZjA1MDEy Y2ZmYjYzZTMwYWRmMGNmNzUzNmUyZi4uM2U3N2ZkODE4YWM1NWYxNGJhNmQyMDZkNmEwNmY3OGYz NDJlMTllYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMzIEBACiAyMDEzLTA1LTAxICBBbmRlcnMg Q2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQmVnaW4gd29yayBvbiBs b2FkaW5nIGl0ZW1zIGZyb20gdGhlIGxvY2FsIHN0b3JhZ2UgZGF0YWJhc2UKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTQ4OQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNvbWUgb2YgdGhlIExvY2FsU3Rv cmFnZURhdGFiYXNlIGNvZGUgaXMgb3JpZ2luYWxseSBmcm9tIFdlYkNvcmUsCisgICAgICAgIGJ1 dCBoYXMgYmVlbiBzaW1wbGlmaWVkIGR1ZSB0byB0aGUgZmFjdCB0aGF0IHdlIGRvbid0IG5lZWQg dG8gbG9hZAorICAgICAgICBkYXRhYmFzZSBkYXRhIGFzeW5jaHJvbm91c2x5IHNpbmNlIHdlJ3Jl IGFscmVhZHkgcnVubmluZyBvbiBhIG5vbi1tYWluIHRocmVhZC4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 TG9jYWxTdG9yYWdlRGF0YWJhc2U6OkxvY2FsU3RvcmFnZURhdGFiYXNlKToKKyAgICAgICAgKFdl YktpdDo6TG9jYWxTdG9yYWdlRGF0YWJhc2U6Om9wZW5EYXRhYmFzZSk6CisgICAgICAgIChXZWJL aXQ6OkxvY2FsU3RvcmFnZURhdGFiYXNlOjp0cnlUb09wZW5EYXRhYmFzZSk6CisgICAgICAgIChX ZWJLaXQ6OkxvY2FsU3RvcmFnZURhdGFiYXNlOjptaWdyYXRlSXRlbVRhYmxlSWZOZWVkZWQpOgor ICAgICAgICAoV2ViS2l0OjpMb2NhbFN0b3JhZ2VEYXRhYmFzZTo6aW1wb3J0SXRlbXMpOgorCisg ICAgICAgICogVUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2UuaDoKKyAgICAg ICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjpzZXRJdGVtKToKKyAgICAg ICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjpyZW1vdmVJdGVtKToKKyAg ICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjpjbGVhcik6CisgICAg ICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6aXRlbXMpOgorICAgICAg ICBDYWxsIGltcG9ydEl0ZW1zRnJvbURhdGFiYXNlKCkuCisgICAgICAgIAorICAgICAgICAoV2Vi S2l0OjpTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6OmltcG9ydEl0ZW1zRnJvbURhdGFiYXNl KToKKyAgICAgICAgQXNrIHRoZSBkYXRhYmFzZSB0byBpbXBvcnQgdGhlIGl0ZW1zLgorCisyMDEz LTA1LTAxICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAg QWRkIExvY2FsU3RvcmFnZURhdGFiYXNlIGNsYXNzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTU0ODYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgppbmRleCBm NDA2MzEzMDFjMDdlODJjYTg5Zjk4ZTMyYzc1OWJjOThiOTcwNjA3Li40ZTBiMDk2NmNiNTI4ODM0 YTE3YTEzM2E2OTVlZTMzOTQ2NDkyZGIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLmV4cC5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtOTQsNiAr OTQsNyBAQCBfX1pON1dlYkNvcmUxMFN0b3JhZ2VNYXAza2V5RWoKIF9fWk43V2ViQ29yZTEwU3Rv cmFnZU1hcDZjcmVhdGVFagogX19aTjdXZWJDb3JlMTBTdG9yYWdlTWFwN3NldEl0ZW1FUktOM1dU RjZTdHJpbmdFUzRfUlMyX1JiCiBfX1pON1dlYkNvcmUxMGRlbGV0ZUZpbGVFUktOM1dURjZTdHJp bmdFCitfX1pON1dlYkNvcmUxMGZpbGVFeGlzdHNFUktOM1dURjZTdHJpbmdFCiBfX1pON1dlYkNv cmUxMHNldENvb2tpZXNFUE5TXzhEb2N1bWVudEVSS05TXzRLVVJMRVJLTjNXVEY2U3RyaW5nRQog X19aTjdXZWJDb3JlMTB0b0RvY3VtZW50RU4zSlNDN0pTVmFsdWVFCiBfX1pON1dlYkNvcmUxMUJp dG1hcEltYWdlQzFFUDdDR0ltYWdlUE5TXzEzSW1hZ2VPYnNlcnZlckUKQEAgLTM1NSw2ICszNTYs OSBAQCBfX1pON1dlYkNvcmUxNFJlc291cmNlSGFuZGxlNDVjb250aW51ZUNhbkF1dGhlbnRpY2F0 ZUFnYWluc3RQcm90ZWN0aW9uU3BhY2VFYgogX19aTjdXZWJDb3JlMTRSZXNvdXJjZUhhbmRsZTZj cmVhdGVFUE5TXzE3TmV0d29ya2luZ0NvbnRleHRFUktOU18xNVJlc291cmNlUmVxdWVzdEVQTlNf MjBSZXNvdXJjZUhhbmRsZUNsaWVudEViYgogX19aTjdXZWJDb3JlMTRSZXNvdXJjZUxvYWRlcjE0 Y2FuY2VsbGVkRXJyb3JFdgogX19aTjdXZWJDb3JlMTRSZXNvdXJjZUxvYWRlcjZjYW5jZWxFdgor X19aTjdXZWJDb3JlMTRTUUxpdGVEYXRhYmFzZTExdGFibGVFeGlzdHNFUktOM1dURjZTdHJpbmdF CitfX1pON1dlYkNvcmUxNFNRTGl0ZURhdGFiYXNlMTRleGVjdXRlQ29tbWFuZEVSS04zV1RGNlN0 cmluZ0UKK19fWk43V2ViQ29yZTE0U1FMaXRlRGF0YWJhc2U0b3BlbkVSS04zV1RGNlN0cmluZ0Vi CiBfX1pON1dlYkNvcmUxNFNjaGVtZVJlZ2lzdHJ5MjRyZWdpc3RlclVSTFNjaGVtZUFzTG9jYWxF UktOM1dURjZTdHJpbmdFCiBfX1pON1dlYkNvcmUxNFNjaGVtZVJlZ2lzdHJ5MjVyZWdpc3RlclVS TFNjaGVtZUFzU2VjdXJlRVJLTjNXVEY2U3RyaW5nRQogX19aTjdXZWJDb3JlMTRTY2hlbWVSZWdp c3RyeTI3cmVnaXN0ZXJVUkxTY2hlbWVBc05vQWNjZXNzRVJLTjNXVEY2U3RyaW5nRQpAQCAtNDA5 LDggKzQxMyw2IEBAIF9fWk43V2ViQ29yZTE0ZW5kT2ZQYXJhZ3JhcGhFUktOU18xNVZpc2libGVQ b3NpdGlvbkVOU18yN0VkaXRpbmdCb3VuZGFyeUNyb3NzaW5nCiBfX1pON1dlYkNvcmUxNHNldE1l dGFkYXRhVVJMRVJOM1dURjZTdHJpbmdFUktTMV9TNF8KIF9fWk43V2ViQ29yZTE1QWZmaW5lVHJh bnNmb3JtNWZsaXBZRXYKIF9fWk43V2ViQ29yZTE1QWZmaW5lVHJhbnNmb3JtNXNjYWxlRWQKLV9f Wk5LN1dlYkNvcmUxNUFmZmluZVRyYW5zZm9ybTZ4U2NhbGVFdgotX19aTks3V2ViQ29yZTE1QWZm aW5lVHJhbnNmb3JtNnlTY2FsZUV2CiBfX1pON1dlYkNvcmUxNUFmZmluZVRyYW5zZm9ybThtdWx0 aXBseUVSS1MwXwogX19aTjdXZWJDb3JlMTVBZmZpbmVUcmFuc2Zvcm05dHJhbnNsYXRlRWRkCiBf X1pON1dlYkNvcmUxNUFmZmluZVRyYW5zZm9ybUMxRWRkZGRkZApAQCAtNDcyLDYgKzQ3NCw5IEBA IF9fWk43V2ViQ29yZTE1UHJvdGVjdGlvblNwYWNlQzFFUktOM1dURjZTdHJpbmdFaU5TXzI1UHJv dGVjdGlvblNwYWNlU2VydmVyVHlwZUVTCiBfX1pON1dlYkNvcmUxNVByb3RlY3Rpb25TcGFjZUMx RXYKIF9fWk43V2ViQ29yZTE1UmVzb3VyY2VSZXF1ZXN0MjFodHRwUGlwZWxpbmluZ0VuYWJsZWRF dgogX19aTjdXZWJDb3JlMTVSZXNvdXJjZVJlcXVlc3QyNHNldEhUVFBQaXBlbGluaW5nRW5hYmxl ZEViCitfX1pON1dlYkNvcmUxNVNRTGl0ZVN0YXRlbWVudDIyaXNDb2x1bW5EZWNsYXJlZEFzQmxv YkVpCitfX1pON1dlYkNvcmUxNVNRTGl0ZVN0YXRlbWVudEMxRVJOU18xNFNRTGl0ZURhdGFiYXNl RVJLTjNXVEY2U3RyaW5nRQorX19aTjdXZWJDb3JlMTVTUUxpdGVTdGF0ZW1lbnREMUV2CiBfX1pO N1dlYkNvcmUxNVNjcm9sbEFsaWdubWVudDE3YWxpZ25DZW50ZXJBbHdheXNFCiBfX1pON1dlYkNv cmUxNVNjcm9sbEFsaWdubWVudDE5YWxpZ25Ub0VkZ2VJZk5lZWRlZEUKIF9fWk43V2ViQ29yZTE1 U3RvcmFnZVN0cmF0ZWd5MjFsb2NhbFN0b3JhZ2VOYW1lc3BhY2VFUE5TXzlQYWdlR3JvdXBFCkBA IC01MjgsNiArNTMzLDExIEBAIF9fWk43V2ViQ29yZTE2TmF2aWdhdGlvbkFjdGlvbkMxRVJLTlNf MTVSZXNvdXJjZVJlcXVlc3RFTlNfMTNGcmFtZUxvYWRUeXBlRWIKIF9fWk43V2ViQ29yZTE2TmF2 aWdhdGlvbkFjdGlvbkMxRVJLTlNfMTVSZXNvdXJjZVJlcXVlc3RFTlNfMTROYXZpZ2F0aW9uVHlw ZUUKIF9fWk43V2ViQ29yZTE2TmF2aWdhdGlvbkFjdGlvbkMxRXYKIF9fWk43V2ViQ29yZTE2UmVz b3VyY2VSZXNwb25zZTE5c2V0Q2VydGlmaWNhdGVDaGFpbkVQSzlfX0NGQXJyYXkKK19fWk43V2Vi Q29yZTE3U1FMaXRlVHJhbnNhY3Rpb241YmVnaW5FdgorX19aTjdXZWJDb3JlMTdTUUxpdGVUcmFu c2FjdGlvbjZjb21taXRFdgorX19aTjdXZWJDb3JlMTdTUUxpdGVUcmFuc2FjdGlvbjhyb2xsYmFj a0V2CitfX1pON1dlYkNvcmUxN1NRTGl0ZVRyYW5zYWN0aW9uQzFFUk5TXzE0U1FMaXRlRGF0YWJh c2VFYgorX19aTjdXZWJDb3JlMTdTUUxpdGVUcmFuc2FjdGlvbkQxRXYKIF9fWk43V2ViQ29yZTE2 U2NyaXB0Q29udHJvbGxlcjEwaW5pdFNjcmlwdEVQTlNfMTVET01XcmFwcGVyV29ybGRFCiBfX1pO N1dlYkNvcmUxNlNjcmlwdENvbnRyb2xsZXIxMWNyZWF0ZVdvcmxkRXYKIF9fWk43V2ViQ29yZTE2 U2NyaXB0Q29udHJvbGxlcjEzZXhlY3V0ZVNjcmlwdEVSS04zV1RGNlN0cmluZ0ViCkBAIC0xMzYx LDYgKzEzNzEsOCBAQCBfX1pOSzdXZWJDb3JlMTRSZXNvdXJjZUJ1ZmZlcjRzaXplRXYKIF9fWk5L N1dlYkNvcmUxNFJlc291cmNlQnVmZmVyN2lzRW1wdHlFdgogX19aTks3V2ViQ29yZTE0UmVzb3Vy Y2VIYW5kbGUxMGNvbm5lY3Rpb25FdgogX19aTks3V2ViQ29yZTE0UmVzb3VyY2VMb2FkZXIxMWZy YW1lTG9hZGVyRXYKK19fWk43V2ViQ29yZTE0U1FMaXRlRGF0YWJhc2VDMUV2CitfX1pON1dlYkNv cmUxNFNRTGl0ZURhdGFiYXNlRDFFdgogX19aTks3V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWExNHNj cm9sbEFuaW1hdG9yRXYKIF9fWk5LN1dlYkNvcmUxNFNjcm9sbGFibGVBcmVhMjBjb250ZW50QXJl YVdpbGxQYWludEV2CiBfX1pOSzdXZWJDb3JlMTRTY3JvbGxhYmxlQXJlYTIybW91c2VFeGl0ZWRD b250ZW50QXJlYUV2CkBAIC0xMzc1LDYgKzEzODcsOCBAQCBfX1pOSzdXZWJDb3JlMTRTZWN1cml0 eU9yaWdpbjh0b1N0cmluZ0V2CiBfX1pOSzdXZWJDb3JlMTRTZWN1cml0eU9yaWdpbjE2Y2FuQWNj ZXNzU3RvcmFnZUVQS1MwXwogX19aTks3V2ViQ29yZTE1QWZmaW5lVHJhbnNmb3JtMTBpc0lkZW50 aXR5RXYKIF9fWk5LN1dlYkNvcmUxNUFmZmluZVRyYW5zZm9ybTEyaXNJbnZlcnRpYmxlRXYKK19f Wk5LN1dlYkNvcmUxNUFmZmluZVRyYW5zZm9ybTZ4U2NhbGVFdgorX19aTks3V2ViQ29yZTE1QWZm aW5lVHJhbnNmb3JtNnlTY2FsZUV2CiBfX1pOSzdXZWJDb3JlMTVBZmZpbmVUcmFuc2Zvcm03aW52 ZXJzZUV2CiBfX1pOSzdXZWJDb3JlMTVBZmZpbmVUcmFuc2Zvcm04bWFwUG9pbnRFUktOU18xMEZs b2F0UG9pbnRFCiBfX1pOSzdXZWJDb3JlMTVBZmZpbmVUcmFuc2Zvcm04bWFwUG9pbnRFUktOU184 SW50UG9pbnRFCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2oKaW5kZXggOGVkYTE0MWQzOWM2OTQ4YWE5Mjk4NGNmNmE2YzgzY2I0YmE3ZmIyNi4u YTI0NWY5YmI5YjJmOGIzMTc0NzM0ZWM5MGIyMDRiNDNmYjI2YTU0MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtNDAwLDcgKzQw MCw3IEBACiAJCTFBMjI0NjQ5MENDOThEREIwMEMwNTI0MCAvKiBTUUxpdGVEYXRhYmFzZS5jcHAg aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTIyNDY0MzBD Qzk4RERCMDBDMDUyNDAgLyogU1FMaXRlRGF0YWJhc2UuY3BwICovOyB9OwogCQkxQTIyNDY0QTBD Qzk4RERCMDBDMDUyNDAgLyogU1FMaXRlRGF0YWJhc2UuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBMjI0NjQ0MENDOThEREIwMEMwNTI0MCAvKiBTUUxp dGVEYXRhYmFzZS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07 IH07CiAJCTFBMjI0NjRCMENDOThEREIwMEMwNTI0MCAvKiBTUUxpdGVTdGF0ZW1lbnQuY3BwIGlu IFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUEyMjQ2NDUwQ0M5 OEREQjAwQzA1MjQwIC8qIFNRTGl0ZVN0YXRlbWVudC5jcHAgKi87IH07Ci0JCTFBMjI0NjRDMEND OThEREIwMEMwNTI0MCAvKiBTUUxpdGVTdGF0ZW1lbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBMjI0NjQ2MENDOThEREIwMEMwNTI0MCAvKiBTUUxp dGVTdGF0ZW1lbnQuaCAqLzsgfTsKKwkJMUEyMjQ2NEMwQ0M5OEREQjAwQzA1MjQwIC8qIFNRTGl0 ZVN0YXRlbWVudC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gMUEyMjQ2NDYwQ0M5OEREQjAwQzA1MjQwIC8qIFNRTGl0ZVN0YXRlbWVudC5oICovOyBzZXR0 aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTFBMjI0NjREMENDOThE REIwMEMwNTI0MCAvKiBTUUxpdGVUcmFuc2FjdGlvbi5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTIyNDY0NzBDQzk4RERCMDBDMDUyNDAgLyogU1FM aXRlVHJhbnNhY3Rpb24uY3BwICovOyB9OwogCQkxQTIyNDY0RTBDQzk4RERCMDBDMDUyNDAgLyog U1FMaXRlVHJhbnNhY3Rpb24uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDFBMjI0NjQ4MENDOThEREIwMEMwNTI0MCAvKiBTUUxpdGVUcmFuc2FjdGlvbi5o ICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTFBMkE2 ODIzMEI1QkVERTcwMDAyQTQ4MCAvKiBQcm9ncmVzc1RyYWNrZXIuY3BwIGluIFNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUEyQTY4MjEwQjVCRURFNzAwMDJBNDgw IC8qIFByb2dyZXNzVHJhY2tlci5jcHAgKi87IH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZS5jcHAKaW5kZXggOTZk ZjI2YWYyNTEzODUzZGJjNDU5ZjVhMTA2MjkwNDQ5NGE1YWQ2Yi4uNDA2ODRmMjBkOWYzYzE0NTI2 ZTI1ZjhhMDIyNTA3YzdkOWQ3YjMxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlLmNwcApAQCAtMSw1ICsxLDUg QEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA4LCAyMDA5LCAyMDEwLCAyMDEzIEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwg YXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAt MjcsOSArMjcsMTQgQEAKICNpbmNsdWRlICJMb2NhbFN0b3JhZ2VEYXRhYmFzZS5oIgogCiAjaW5j bHVkZSAiV29ya1F1ZXVlLmgiCisjaW5jbHVkZSA8V2ViQ29yZS9GaWxlU3lzdGVtLmg+CisjaW5j bHVkZSA8V2ViQ29yZS9TUUxpdGVTdGF0ZW1lbnQuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL1NRTGl0 ZVRyYW5zYWN0aW9uLmg+CiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4KICNpbmNsdWRlIDx3 dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAordXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CisKIG5hbWVz cGFjZSBXZWJLaXQgewogCiBQYXNzUmVmUHRyPExvY2FsU3RvcmFnZURhdGFiYXNlPiBMb2NhbFN0 b3JhZ2VEYXRhYmFzZTo6Y3JlYXRlKGNvbnN0IFN0cmluZyYgZGF0YWJhc2VGaWxlbmFtZSwgUGFz c1JlZlB0cjxXb3JrUXVldWU+IHF1ZXVlKQpAQCAtMzgsMjAgKzQzLDEwNiBAQCBQYXNzUmVmUHRy PExvY2FsU3RvcmFnZURhdGFiYXNlPiBMb2NhbFN0b3JhZ2VEYXRhYmFzZTo6Y3JlYXRlKGNvbnN0 IFN0cmluZyYgZGF0YQogfQogCiBMb2NhbFN0b3JhZ2VEYXRhYmFzZTo6TG9jYWxTdG9yYWdlRGF0 YWJhc2UoY29uc3QgU3RyaW5nJiBkYXRhYmFzZUZpbGVuYW1lLCBQYXNzUmVmUHRyPFdvcmtRdWV1 ZT4gcXVldWUpCi0gICAgOiBtX3F1ZXVlKHF1ZXVlKQorICAgIDogbV9kYXRhYmFzZUZpbGVuYW1l KGRhdGFiYXNlRmlsZW5hbWUpCisgICAgLCBtX3F1ZXVlKHF1ZXVlKQorICAgICwgbV9mYWlsZWRU b09wZW5EYXRhYmFzZShmYWxzZSkKIHsKLSAgICAvLyBGSVhNRTogSWYgaXQgY2FuJ3QgaW1wb3J0 LCB0aGVuIHRoZSBkZWZhdWx0IFdlYktpdCBiZWhhdmlvciBzaG91bGQgYmUgdGhhdCBvZiBwcml2 YXRlIGJyb3dzaW5nLAotICAgIC8vIG5vdCBzaWxlbnRseSBpZ25vcmluZyBpdC4gaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1ODk0Ci0gICAgbV9xdWV1ZS0+ZGlzcGF0 Y2goYmluZCgmTG9jYWxTdG9yYWdlRGF0YWJhc2U6OnBlcmZvcm1JbXBvcnQsIHRoaXMpKTsKIH0K IAogTG9jYWxTdG9yYWdlRGF0YWJhc2U6On5Mb2NhbFN0b3JhZ2VEYXRhYmFzZSgpCiB7CiB9CiAK LXZvaWQgTG9jYWxTdG9yYWdlRGF0YWJhc2U6OnBlcmZvcm1JbXBvcnQoKQordm9pZCBMb2NhbFN0 b3JhZ2VEYXRhYmFzZTo6b3BlbkRhdGFiYXNlKERhdGFiYXNlT3BlbmluZ1N0cmF0ZWd5IG9wZW5p bmdTdHJhdGVneSkKK3sKKyAgICBBU1NFUlQoIW1fZGF0YWJhc2UuaXNPcGVuKCkpOworICAgIEFT U0VSVCghbV9mYWlsZWRUb09wZW5EYXRhYmFzZSk7CisKKyAgICBpZiAoIXRyeVRvT3BlbkRhdGFi YXNlKG9wZW5pbmdTdHJhdGVneSkpCisgICAgICAgIG1fZmFpbGVkVG9PcGVuRGF0YWJhc2UgPSB0 cnVlOworfQorCitib29sIExvY2FsU3RvcmFnZURhdGFiYXNlOjp0cnlUb09wZW5EYXRhYmFzZShE YXRhYmFzZU9wZW5pbmdTdHJhdGVneSBvcGVuaW5nU3RyYXRlZ3kpCit7CisgICAgaWYgKCFmaWxl RXhpc3RzKG1fZGF0YWJhc2VGaWxlbmFtZSkgJiYgb3BlbmluZ1N0cmF0ZWd5ID09IFNraXBJZk5v bkV4aXN0ZW50KQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIGlmIChtX2RhdGFiYXNlRmls ZW5hbWUuaXNFbXB0eSgpKSB7CisgICAgICAgIExPR19FUlJPUigiRmlsZW5hbWUgZm9yIGxvY2Fs IHN0b3JhZ2UgZGF0YWJhc2UgaXMgZW1wdHkgLSBjYW5ub3Qgb3BlbiBmb3IgcGVyc2lzdGVudCBz dG9yYWdlIik7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICAvLyBGSVhNRToK KyAgICAvLyBBIFN0b3JhZ2VUcmFja2VyIHRocmVhZCBtYXkgaGF2ZSBiZWVuIHNjaGVkdWxlZCB0 byBkZWxldGUgdGhlIGRiIHdlJ3JlCisgICAgLy8gcmVvcGVuaW5nLCBzbyBjYW5jZWwgcG9zc2li bGUgZGVsZXRpb24uCisKKyAgICBpZiAoIW1fZGF0YWJhc2Uub3BlbihtX2RhdGFiYXNlRmlsZW5h bWUpKSB7CisgICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRvIG9wZW4gZGF0YWJhc2UgZmlsZSAl cyBmb3IgbG9jYWwgc3RvcmFnZSIsIG1fZGF0YWJhc2VGaWxlbmFtZS51dGY4KCkuZGF0YSgpKTsK KyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKworICAgIGlmICghbWlncmF0ZUl0ZW1UYWJs ZUlmTmVlZGVkKCkpIHsKKyAgICAgICAgLy8gV2UgZmFpbGVkIHRvIG1pZ3JhdGUgdGhlIGl0ZW0g dGFibGUuIEluIG9yZGVyIHRvIGF2b2lkIHRyeWluZyB0byBtaWdyYXRlIHRoZSB0YWJsZSBvdmVy IGFuZCBvdmVyLAorICAgICAgICAvLyBqdXN0IGRlbGV0ZSBpdCBhbmQgc3RhcnQgZnJvbSBzY3Jh dGNoLgorICAgICAgICBtX2RhdGFiYXNlLmV4ZWN1dGVDb21tYW5kKCJEUk9QIFRBQkxFIEl0ZW1U YWJsZSIpOworICAgIH0KKworICAgIGlmICghbV9kYXRhYmFzZS5leGVjdXRlQ29tbWFuZCgiQ1JF QVRFIFRBQkxFIElGIE5PVCBFWElTVFMgSXRlbVRhYmxlIChrZXkgVEVYVCBVTklRVUUgT04gQ09O RkxJQ1QgUkVQTEFDRSwgdmFsdWUgQkxPQiBOT1QgTlVMTCBPTiBDT05GTElDVCBGQUlMKSIpKSB7 CisgICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRvIGNyZWF0ZSB0YWJsZSBJdGVtVGFibGUgZm9y IGxvY2FsIHN0b3JhZ2UiKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKworICAgIHJl dHVybiB0cnVlOworfQorCitib29sIExvY2FsU3RvcmFnZURhdGFiYXNlOjptaWdyYXRlSXRlbVRh YmxlSWZOZWVkZWQoKQogewotICAgIC8vIEZJWE1FOiBBY3R1YWxseSBpbXBvcnQuCisgICAgaWYg KCFtX2RhdGFiYXNlLnRhYmxlRXhpc3RzKCJJdGVtVGFibGUiKSkKKyAgICAgICAgcmV0dXJuIHRy dWU7CisKKyAgICBTUUxpdGVTdGF0ZW1lbnQgcXVlcnkobV9kYXRhYmFzZSwgIlNFTEVDVCB2YWx1 ZSBGUk9NIEl0ZW1UYWJsZSBMSU1JVCAxIik7CisKKyAgICAvLyBUaGlzIHF1ZXJ5IGlzbid0IGV2 ZXIgZXhlY3V0ZWQsIGl0J3MganVzdCB1c2VkIHRvIGNoZWNrIHRoZSBjb2x1bW4gdHlwZS4KKyAg ICBpZiAocXVlcnkuaXNDb2x1bW5EZWNsYXJlZEFzQmxvYigwKSkKKyAgICAgICAgcmV0dXJuIHRy dWU7CisKKyAgICAvLyBDcmVhdGUgYSBuZXcgdGFibGUgd2l0aCB0aGUgcmlnaHQgdHlwZSwgY29w eSBhbGwgdGhlIGRhdGEgb3ZlciB0byBpdCBhbmQgdGhlbiByZXBsYWNlIHRoZSBuZXcgdGFibGUg d2l0aCB0aGUgb2xkIHRhYmxlLgorICAgIHN0YXRpYyBjb25zdCBjaGFyKiBjb21tYW5kc1tdID0g eworICAgICAgICAiRFJPUCBUQUJMRSBJRiBFWElTVFMgSXRlbVRhYmxlMiIsCisgICAgICAgICJD UkVBVEUgVEFCTEUgSXRlbVRhYmxlMiAoa2V5IFRFWFQgVU5JUVVFIE9OIENPTkZMSUNUIFJFUExB Q0UsIHZhbHVlIEJMT0IgTk9UIE5VTEwgT04gQ09ORkxJQ1QgRkFJTCkiLAorICAgICAgICAiSU5T RVJUIElOVE8gSXRlbVRhYmxlMiBTRUxFQ1QgKiBmcm9tIEl0ZW1UYWJsZSIsCisgICAgICAgICJE Uk9QIFRBQkxFIEl0ZW1UYWJsZSIsCisgICAgICAgICJBTFRFUiBUQUJMRSBJdGVtVGFibGUyIFJF TkFNRSBUTyBJdGVtVGFibGUiLAorICAgICAgICAwLAorICAgIH07CisKKyAgICBTUUxpdGVUcmFu c2FjdGlvbiB0cmFuc2FjdGlvbihtX2RhdGFiYXNlLCBmYWxzZSk7CisgICAgdHJhbnNhY3Rpb24u YmVnaW4oKTsKKworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBjb21tYW5kc1tpXTsgKytpKSB7Cisg ICAgICAgIGlmIChtX2RhdGFiYXNlLmV4ZWN1dGVDb21tYW5kKGNvbW1hbmRzW2ldKSkKKyAgICAg ICAgICAgIGNvbnRpbnVlOworCisgICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRvIG1pZ3JhdGUg dGFibGUgSXRlbVRhYmxlIGZvciBsb2NhbCBzdG9yYWdlIHdoZW4gZXhlY3V0aW5nOiAlcyIsIGNv bW1hbmRzW2ldKTsKKyAgICAgICAgdHJhbnNhY3Rpb24ucm9sbGJhY2soKTsKKworICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgfQorCisgICAgdHJhbnNhY3Rpb24uY29tbWl0KCk7CisgICAgcmV0 dXJuIHRydWU7Cit9CisKK3ZvaWQgTG9jYWxTdG9yYWdlRGF0YWJhc2U6OmltcG9ydEl0ZW1zKFN0 b3JhZ2VNYXAmKQoreworICAgIC8vIEZJWE1FOiBJZiBpdCBjYW4ndCBpbXBvcnQsIHRoZW4gdGhl IGRlZmF1bHQgV2ViS2l0IGJlaGF2aW9yIHNob3VsZCBiZSB0aGF0IG9mIHByaXZhdGUgYnJvd3Np bmcsCisgICAgLy8gbm90IHNpbGVudGx5IGlnbm9yaW5nIGl0LiBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjU4OTQKKworICAgIG9wZW5EYXRhYmFzZShTa2lwSWZOb25F eGlzdGVudCk7CisgICAgaWYgKCFtX2RhdGFiYXNlLmlzT3BlbigpKQorICAgICAgICByZXR1cm47 CisKKyAgICAvLyBGSVhNRTogQWN0dWFsbHkgaW1wb3J0IHRoZSBpdGVtcy4KIH0KIAogfSAvLyBu YW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3Rv cmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0 b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2UuaAppbmRleCAyMTExNWVmMmI2MzBhYjE1MDI1ZGFi NmY2M2VjZWNmNjVhMWYyMDVkLi5iY2U0MjQxYTE0MmE5YjgzMjlhZDUwNjI1MzVmZTFiZWM0OWY1 Y2JjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0 b3JhZ2VEYXRhYmFzZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xv Y2FsU3RvcmFnZURhdGFiYXNlLmgKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChD KSAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykg MjAwOCwgMjAwOSwgMjAxMCwgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAg KgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQg dGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTI2LDEyICsyNiwxNyBAQAogI2lmbmRl ZiBMb2NhbFN0b3JhZ2VEYXRhYmFzZV9oCiAjZGVmaW5lIExvY2FsU3RvcmFnZURhdGFiYXNlX2gK IAorI2luY2x1ZGUgPFdlYkNvcmUvU1FMaXRlRGF0YWJhc2UuaD4KICNpbmNsdWRlIDx3dGYvRm9y d2FyZC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYvVGhyZWFkU2Fm ZVJlZkNvdW50ZWQuaD4KIAogY2xhc3MgV29ya1F1ZXVlOwogCituYW1lc3BhY2UgV2ViQ29yZSB7 CitjbGFzcyBTdG9yYWdlTWFwOworfQorCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgTG9j YWxTdG9yYWdlRGF0YWJhc2UgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8TG9jYWxTdG9y YWdlRGF0YWJhc2U+IHsKQEAgLTM5LDEyICs0NCwyOCBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFBh c3NSZWZQdHI8TG9jYWxTdG9yYWdlRGF0YWJhc2U+IGNyZWF0ZShjb25zdCBTdHJpbmcmIGRhdGFi YXNlRmlsZW5hbWUsIFBhc3NSZWZQdHI8V29ya1F1ZXVlPik7CiAgICAgfkxvY2FsU3RvcmFnZURh dGFiYXNlKCk7CiAKKyAgICAvLyBXaWxsIGJsb2NrIHVudGlsIHRoZSBpbXBvcnQgaXMgY29tcGxl dGUuCisgICAgdm9pZCBpbXBvcnRJdGVtcyhXZWJDb3JlOjpTdG9yYWdlTWFwJik7CisKIHByaXZh dGU6CiAgICAgTG9jYWxTdG9yYWdlRGF0YWJhc2UoY29uc3QgU3RyaW5nJiBkYXRhYmFzZUZpbGVu YW1lLCBQYXNzUmVmUHRyPFdvcmtRdWV1ZT4pOwogCisgICAgZW51bSBEYXRhYmFzZU9wZW5pbmdT dHJhdGVneSB7CisgICAgICAgIENyZWF0ZUlmTm9uRXhpc3RlbnQsCisgICAgICAgIFNraXBJZk5v bkV4aXN0ZW50CisgICAgfTsKKyAgICBib29sIHRyeVRvT3BlbkRhdGFiYXNlKERhdGFiYXNlT3Bl bmluZ1N0cmF0ZWd5KTsKKyAgICB2b2lkIG9wZW5EYXRhYmFzZShEYXRhYmFzZU9wZW5pbmdTdHJh dGVneSk7CisKKyAgICBib29sIG1pZ3JhdGVJdGVtVGFibGVJZk5lZWRlZCgpOworCiAgICAgdm9p ZCBwZXJmb3JtSW1wb3J0KCk7CiAKKyAgICBTdHJpbmcgbV9kYXRhYmFzZUZpbGVuYW1lOwogICAg IFJlZlB0cjxXb3JrUXVldWU+IG1fcXVldWU7CisKKyAgICBXZWJDb3JlOjpTUUxpdGVEYXRhYmFz ZSBtX2RhdGFiYXNlOworICAgIGJvb2wgbV9mYWlsZWRUb09wZW5EYXRhYmFzZTsKIH07CiAKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFn ZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIu Y3BwCmluZGV4IGNjYjdhNjM5ZDdlZDdlNDdhZDdjNDI1YjE0NjUwNGVmMjkzZmI2MjYuLjBhODBl YWQyYTRjNzlkOWY0MzE1NmE5YjhkZjFhN2NhZjAyZjRhMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAKQEAgLTU2LDExICs1 NiwxMyBAQCBwdWJsaWM6CiAgICAgdm9pZCByZW1vdmVJdGVtKENvcmVJUEM6OkNvbm5lY3Rpb24q IHNvdXJjZUNvbm5lY3Rpb24sIHVpbnQ2NF90IHNvdXJjZVN0b3JhZ2VBcmVhSUQsIGNvbnN0IFN0 cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHVybFN0cmluZyk7CiAgICAgdm9pZCBjbGVhcihDb3Jl SVBDOjpDb25uZWN0aW9uKiBzb3VyY2VDb25uZWN0aW9uLCB1aW50NjRfdCBzb3VyY2VTdG9yYWdl QXJlYUlELCBjb25zdCBTdHJpbmcmIHVybFN0cmluZyk7CiAKLSAgICBjb25zdCBIYXNoTWFwPFN0 cmluZywgU3RyaW5nPiYgaXRlbXMoKSBjb25zdCB7IHJldHVybiBtX3N0b3JhZ2VNYXAtPml0ZW1z KCk7IH0KKyAgICBjb25zdCBIYXNoTWFwPFN0cmluZywgU3RyaW5nPiYgaXRlbXMoKTsKIAogcHJp dmF0ZToKICAgICBleHBsaWNpdCBTdG9yYWdlQXJlYShMb2NhbFN0b3JhZ2VOYW1lc3BhY2UqLCBQ YXNzUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiwgdW5zaWduZWQgcXVvdGFJbkJ5dGVzKTsKIAorICAg IHZvaWQgaW1wb3J0SXRlbXNGcm9tRGF0YWJhc2UoKTsKKwogICAgIHZvaWQgZGlzcGF0Y2hFdmVu dHMoQ29yZUlQQzo6Q29ubmVjdGlvbiogc291cmNlQ29ubmVjdGlvbiwgdWludDY0X3Qgc291cmNl U3RvcmFnZUFyZWFJRCwgY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgb2xkVmFsdWUs IGNvbnN0IFN0cmluZyYgbmV3VmFsdWUsIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nKSBjb25zdDsK IAogICAgIC8vIFdpbGwgYmUgbnVsbCBpZiB0aGUgc3RvcmFnZSBhcmVhIGJlbG9uZ3MgdG8gYSBz ZXNzaW9uIHN0b3JhZ2UgbmFtZXNwYWNlLgpAQCAtMTQzLDYgKzE0NSw4IEBAIFBhc3NSZWZQdHI8 U3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhPiBTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6 OmNsb25lKCkgY29uCiAKIHZvaWQgU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjpzZXRJdGVt KENvcmVJUEM6OkNvbm5lY3Rpb24qIHNvdXJjZUNvbm5lY3Rpb24sIHVpbnQ2NF90IHNvdXJjZVN0 b3JhZ2VBcmVhSUQsIGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbHVlLCBjb25z dCBTdHJpbmcmIHVybFN0cmluZywgYm9vbCYgcXVvdGFFeGNlcHRpb24pCiB7CisgICAgaW1wb3J0 SXRlbXNGcm9tRGF0YWJhc2UoKTsKKwogICAgIFN0cmluZyBvbGRWYWx1ZTsKIAogICAgIFJlZlB0 cjxTdG9yYWdlTWFwPiBuZXdTdG9yYWdlTWFwID0gbV9zdG9yYWdlTWFwLT5zZXRJdGVtKGtleSwg dmFsdWUsIG9sZFZhbHVlLCBxdW90YUV4Y2VwdGlvbik7CkBAIC0xNTUsNiArMTU5LDggQEAgdm9p ZCBTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6OnNldEl0ZW0oQ29yZUlQQzo6Q29ubmVjdGlv biogc291cmNlQ29ubmVjdGlvbiwKIAogdm9pZCBTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6 OnJlbW92ZUl0ZW0oQ29yZUlQQzo6Q29ubmVjdGlvbiogc291cmNlQ29ubmVjdGlvbiwgdWludDY0 X3Qgc291cmNlU3RvcmFnZUFyZWFJRCwgY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYg dXJsU3RyaW5nKQogeworICAgIGltcG9ydEl0ZW1zRnJvbURhdGFiYXNlKCk7CisKICAgICBTdHJp bmcgb2xkVmFsdWU7CiAgICAgUmVmUHRyPFN0b3JhZ2VNYXA+IG5ld1N0b3JhZ2VNYXAgPSBtX3N0 b3JhZ2VNYXAtPnJlbW92ZUl0ZW0oa2V5LCBvbGRWYWx1ZSk7CiAgICAgaWYgKG5ld1N0b3JhZ2VN YXApCkBAIC0xNjgsNiArMTc0LDggQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6 OnJlbW92ZUl0ZW0oQ29yZUlQQzo6Q29ubmVjdGlvbiogc291cmNlQ29ubmVjdGkKIAogdm9pZCBT dG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6OmNsZWFyKENvcmVJUEM6OkNvbm5lY3Rpb24qIHNv dXJjZUNvbm5lY3Rpb24sIHVpbnQ2NF90IHNvdXJjZVN0b3JhZ2VBcmVhSUQsIGNvbnN0IFN0cmlu ZyYgdXJsU3RyaW5nKQogeworICAgIGltcG9ydEl0ZW1zRnJvbURhdGFiYXNlKCk7CisKICAgICBp ZiAoIW1fc3RvcmFnZU1hcC0+bGVuZ3RoKCkpCiAgICAgICAgIHJldHVybjsKIApAQCAtMTc2LDYg KzE4NCwyMSBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6Y2xlYXIoQ29yZUlQ Qzo6Q29ubmVjdGlvbiogc291cmNlQ29ubmVjdGlvbiwgdQogICAgIGRpc3BhdGNoRXZlbnRzKHNv dXJjZUNvbm5lY3Rpb24sIHNvdXJjZVN0b3JhZ2VBcmVhSUQsIFN0cmluZygpLCBTdHJpbmcoKSwg U3RyaW5nKCksIHVybFN0cmluZyk7CiB9CiAKK2NvbnN0IEhhc2hNYXA8U3RyaW5nLCBTdHJpbmc+ JiBTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6Oml0ZW1zKCkKK3sKKyAgICBpbXBvcnRJdGVt c0Zyb21EYXRhYmFzZSgpOworCisgICAgcmV0dXJuIG1fc3RvcmFnZU1hcC0+aXRlbXMoKTsKK30K Kwordm9pZCBTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6OmltcG9ydEl0ZW1zRnJvbURhdGFi YXNlKCkKK3sKKyAgICBpZiAoIW1fbG9jYWxTdG9yYWdlRGF0YWJhc2UpCisgICAgICAgIHJldHVy bjsKKworICAgIG1fbG9jYWxTdG9yYWdlRGF0YWJhc2UtPmltcG9ydEl0ZW1zKCptX3N0b3JhZ2VN YXApOworfQorCiB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6ZGlzcGF0Y2hFdmVu dHMoQ29yZUlQQzo6Q29ubmVjdGlvbiogc291cmNlQ29ubmVjdGlvbiwgdWludDY0X3Qgc291cmNl U3RvcmFnZUFyZWFJRCwgY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgb2xkVmFsdWUs IGNvbnN0IFN0cmluZyYgbmV3VmFsdWUsIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nKSBjb25zdAog ewogICAgIGZvciAoSGFzaFNldDxzdGQ6OnBhaXI8UmVmUHRyPENvcmVJUEM6OkNvbm5lY3Rpb24+ LCB1aW50NjRfdD4gPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtX2V2ZW50TGlzdGVuZXJzLmJlZ2lu KCksIGVuZCA9IG1fZXZlbnRMaXN0ZW5lcnMuZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkgewo=