154682 2016-02-25 10:04:08 -0800 com.apple.WebKit.Networking.Development crashes in WebCore::formOpen() 2016-03-01 16:01:27 -0800 1 1 1 Unclassified WebKit Platform WebKit Local Build Mac Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dbates dbates ap bfulgham darin webkit-bug-importer oldest_to_newest 1168120 0 dbates 2016-02-25 10:04:08 -0800 Crash reports show that com.apple.WebKit.Networking.Development can crash in WebCore::formOpen(). 1168121 1 dbates 2016-02-25 10:04:29 -0800 <rdar://problem/23550269> 1168130 2 272213 dbates 2016-02-25 10:22:24 -0800 Created attachment 272213 Patch 1168139 3 272213 bfulgham 2016-02-25 10:47:11 -0800 Comment on attachment 272213 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=272213&action=review > Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp:182 > + LockHolder locker(form->streamIsBeingOpenedLock); This seems fine, but we should be careful that we don't do any further locking in the code that follows (or the code that is called by the following). I'm not aware of any such case, but we should be on the lookout for deadlocks after this change lands. 1169479 4 dbates 2016-03-01 10:13:24 -0800 (In reply to comment #3) > Comment on attachment 272213 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=272213&action=review > > > Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp:182 > > + LockHolder locker(form->streamIsBeingOpenedLock); > > This seems fine, but we should be careful that we don't do any further > locking in the code that follows Care will need to be taken when additional locks are used in this code to prevent deadlock/livelock. > (or the code that is called by the following). I will update the patch to assert that the added lock is held in WebCore::advanceCurrentStream() and WebCore::closeCurrentStream() to catch calls to these functions that are made without holding the lock. 1169480 5 272571 dbates 2016-03-01 10:16:52 -0800 Created attachment 272571 Patch 1169484 6 272571 bfulgham 2016-03-01 10:24:14 -0800 Comment on attachment 272571 Patch r=me. If EWS is green (ignore Windows right now) please land. 1169610 7 272571 dbates 2016-03-01 16:01:23 -0800 Comment on attachment 272571 Patch Clearing flags on attachment: 272571 Committed r197424: <http://trac.webkit.org/changeset/197424> 1169611 8 dbates 2016-03-01 16:01:27 -0800 All reviewed patches have been landed. Closing bug. 272213 2016-02-25 10:22:24 -0800 2016-03-01 10:16:49 -0800 Patch bug-154682-20160225102207.patch text/plain 2895 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2NjQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDY3ZmNmMWQyMGFmMDI5 NThhMmE1YzVkYmQyY2MyMmNiYmJiOTRhMi4uODUwNTgxZTNjMGJmNzY1NzNlMGJhODA4MWRjN2E2 YWY2OGQ4ZmQyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE2LTAyLTI1ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBjb20uYXBwbGUuV2ViS2l0 Lk5ldHdvcmtpbmcuRGV2ZWxvcG1lbnQgY3Jhc2hlcyBpbiBXZWJDb3JlOjpmb3JtT3BlbigpCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTQ2ODIKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIzNTUwMjY5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFNwZWN1bGF0aXZlIGZpeCBmb3IgYSByYWNlIGNvbmRp dGlvbiB3aGVuIG9wZW5pbmcgdGhlIHN0cmVhbSBmb3IgdGhlIG5leHQgZm9ybSBkYXRhIGVsZW1l bnQuCisgICAgICAgIENhbGxpbmcgQ0ZSZWFkU3RyZWFtT3BlbihzKSBpbiBXZWJDb3JlOjpvcGVu TmV4dFN0cmVhbSgpIGNhbiBjYXVzZSBzdHJlYW0gcyB0byBiZSBjbG9zZWQgYW5kCisgICAgICAg IGRlYWxsb2NhdGVkIGJlZm9yZSBDRlJlYWRTdHJlYW1PcGVuKHMpIHJldHVybnMuCisKKyAgICAg ICAgV2hlbiBXZWJDb3JlOjpvcGVuTmV4dFN0cmVhbSgpIGlzIGNhbGxlZCBpdCBjbG9zZXMgYW5k IGRlYWxsb2NhdGVzIHRoZSBjdXJyZW50IHN0cmVhbSBhbmQKKyAgICAgICAgdGhlbiBvcGVucyBh IG5ldyBzdHJlYW0gZm9yIHRoZSBuZXh0IGZvcm0gZGF0YSBlbGVtZW50LiBDYWxsaW5nIENGUmVh ZFN0cmVhbU9wZW4oKSBpbgorICAgICAgICBXZWJDb3JlOjpvcGVuTmV4dFN0cmVhbSgpIGNhbiBs ZWFkIHRvIFdlYkNvcmU6Om9wZW5OZXh0U3RyZWFtKCkgYmVpbmcgcmUtZW50ZXJlZCB2aWEKKyAg ICAgICAgV2ViQ29yZTo6Zm9ybUV2ZW50Q2FsbGJhY2soKSBmcm9tIGFub3RoZXIgdGhyZWFkLiBP bmUgZXhhbXBsZSB3aGVuIHRoaXMgY2FuIG9jY3VyIGlzIHdoZW4KKyAgICAgICAgdGhlIHN0cmVh bSBiZWluZyBvcGVuZWQgaGFzIG5vIGRhdGEgKGkuZS4gV2ViQ29yZTo6Zm9ybUV2ZW50Q2FsbGJh Y2soKSBpcyBjYWxsZWQKKyAgICAgICAgYmFjayB3aXRoIGV2ZW50IHR5cGUga0NGU3RyZWFtRXZl bnRFbmRFbmNvdW50ZXJlZCkuCisKKyAgICAgICAgSSBoYXZlIGJlZW4gdW5hYmxlIHRvIHJlcHJv ZHVjZSB0aGlzIGNyYXNoLiBXZSBrbm93IHRoYXQgaXQgb2NjdXJzIGZyb20gY3Jhc2ggcmVwb3J0 cy4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY2YvRm9ybURhdGFTdHJlYW1DRk5ldC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpvcGVuTmV4dFN0cmVhbSk6IEFjcXVpcmUgYSBsb2NrIGJl Zm9yZSB3ZSBvcGVuIHRoZSBuZXh0IHN0cmVhbSB0byBlbnN1cmUgdGhhdAorICAgICAgICBleGFj dGx5IG9uZSB0aHJlYWQgZXhlY3V0ZXMgdGhpcyBjcml0aWNhbCBzZWN0aW9uIGF0IGEgdGltZS4K KwogMjAxNi0wMi0xMiAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAg ICAgQ1NQOiAnc2FuZGJveCcgc2hvdWxkIGJlIGlnbm9yZWQgaW4gcmVwb3J0LW9ubHkgbW9kZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9Gb3JtRGF0YVN0 cmVhbUNGTmV0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvRm9ybURh dGFTdHJlYW1DRk5ldC5jcHAKaW5kZXggYzEyNjgyNGYxNjQyZGIyNDU5MmIxOGMwMWM1NzhlZjA5 ZTZhYTY4My4uZjcwOWEwMmQ5MjQyNmYzNGZjMTY4MWI1NDFmMWEwZTg2NjBhYmY1NSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9Gb3JtRGF0YVN0cmVhbUNG TmV0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL0Zvcm1EYXRh U3RyZWFtQ0ZOZXQuY3BwCkBAIC0xMDksNiArMTA5LDcgQEAgc3RydWN0IEZvcm1TdHJlYW1GaWVs ZHMgewogICAgIENGUmVhZFN0cmVhbVJlZiBmb3JtU3RyZWFtOwogICAgIHVuc2lnbmVkIGxvbmcg bG9uZyBzdHJlYW1MZW5ndGg7CiAgICAgdW5zaWduZWQgbG9uZyBsb25nIGJ5dGVzU2VudDsKKyAg ICBMb2NrIHN0cmVhbUlzQmVpbmdPcGVuZWRMb2NrOwogfTsKIAogc3RhdGljIHZvaWQgY2xvc2VD dXJyZW50U3RyZWFtKEZvcm1TdHJlYW1GaWVsZHMqIGZvcm0pCkBAIC0xNzYsNiArMTc3LDEwIEBA IHN0YXRpYyBib29sIGFkdmFuY2VDdXJyZW50U3RyZWFtKEZvcm1TdHJlYW1GaWVsZHMqIGZvcm0p CiAKIHN0YXRpYyBib29sIG9wZW5OZXh0U3RyZWFtKEZvcm1TdHJlYW1GaWVsZHMqIGZvcm0pCiB7 CisgICAgLy8gQ0ZSZWFkU3RyZWFtT3BlbigpIGNhbiBjYXVzZSB0aGlzIGZ1bmN0aW9uIHRvIGJl IHJlLWVudGVyZWQgZnJvbSBhbm90aGVyIHRocmVhZCBiZWZvcmUgaXQgcmV0dXJucy4KKyAgICAv LyBPbmUgZXhhbXBsZSB3aGVuIHRoaXMgY2FuIG9jY3VyIGlzIHdoZW4gdGhlIHN0cmVhbSBiZWlu ZyBvcGVuZWQgaGFzIG5vIGRhdGEuIFNlZSA8cmRhcjovL3Byb2JsZW0vMjM1NTAyNjk+LgorICAg IExvY2tIb2xkZXIgbG9ja2VyKGZvcm0tPnN0cmVhbUlzQmVpbmdPcGVuZWRMb2NrKTsKKwogICAg IC8vIFNraXAgb3ZlciBhbnkgc3RyZWFtcyB3ZSBjYW4ndCBvcGVuLgogICAgIGlmICghYWR2YW5j ZUN1cnJlbnRTdHJlYW0oZm9ybSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK 272571 2016-03-01 10:16:52 -0800 2016-03-01 16:01:23 -0800 Patch bug-154682-20160301101636.patch text/plain 4583 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2NjQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDY3ZmNmMWQyMGFmMDI5 NThhMmE1YzVkYmQyY2MyMmNiYmJiOTRhMi4uOGRjYTc1Y2JlYjUyODFkMjg3MDk1NTkwYjFiMGZj YjI3ZmU2ZWZmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE2LTAzLTAxICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBjb20uYXBwbGUuV2ViS2l0 Lk5ldHdvcmtpbmcuRGV2ZWxvcG1lbnQgY3Jhc2hlcyBpbiBXZWJDb3JlOjpmb3JtT3BlbigpCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTQ2ODIKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIzNTUwMjY5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFNwZWN1bGF0aXZlIGZpeCBmb3IgYSByYWNlIGNvbmRp dGlvbiB3aGVuIG9wZW5pbmcgdGhlIHN0cmVhbSBmb3IgdGhlIG5leHQgZm9ybSBkYXRhIGVsZW1l bnQuCisgICAgICAgIENhbGxpbmcgQ0ZSZWFkU3RyZWFtT3BlbihzKSBpbiBXZWJDb3JlOjpvcGVu TmV4dFN0cmVhbSgpIGNhbiBjYXVzZSBzdHJlYW0gcyB0byBiZSBjbG9zZWQgYW5kCisgICAgICAg IGRlYWxsb2NhdGVkIGJlZm9yZSBDRlJlYWRTdHJlYW1PcGVuKHMpIHJldHVybnMuCisKKyAgICAg ICAgV2hlbiBXZWJDb3JlOjpvcGVuTmV4dFN0cmVhbSgpIGlzIGNhbGxlZCBpdCBjbG9zZXMgYW5k IGRlYWxsb2NhdGVzIHRoZSBjdXJyZW50IHN0cmVhbSBhbmQKKyAgICAgICAgdGhlbiBvcGVucyBh IG5ldyBzdHJlYW0gZm9yIHRoZSBuZXh0IGZvcm0gZGF0YSBlbGVtZW50LiBDYWxsaW5nIENGUmVh ZFN0cmVhbU9wZW4oKSBpbgorICAgICAgICBXZWJDb3JlOjpvcGVuTmV4dFN0cmVhbSgpIGNhbiBs ZWFkIHRvIFdlYkNvcmU6Om9wZW5OZXh0U3RyZWFtKCkgYmVpbmcgcmUtZW50ZXJlZCB2aWEKKyAg ICAgICAgV2ViQ29yZTo6Zm9ybUV2ZW50Q2FsbGJhY2soKSBmcm9tIGFub3RoZXIgdGhyZWFkLiBP bmUgZXhhbXBsZSB3aGVuIHRoaXMgY2FuIG9jY3VyIGlzIHdoZW4KKyAgICAgICAgdGhlIHN0cmVh bSBiZWluZyBvcGVuZWQgaGFzIG5vIGRhdGEgKGkuZS4gV2ViQ29yZTo6Zm9ybUV2ZW50Q2FsbGJh Y2soKSBpcyBjYWxsZWQKKyAgICAgICAgYmFjayB3aXRoIGV2ZW50IHR5cGUga0NGU3RyZWFtRXZl bnRFbmRFbmNvdW50ZXJlZCkuCisKKyAgICAgICAgSSBoYXZlIGJlZW4gdW5hYmxlIHRvIHJlcHJv ZHVjZSB0aGlzIGNyYXNoLiBXZSBrbm93IHRoYXQgaXQgb2NjdXJzIGZyb20gY3Jhc2ggcmVwb3J0 cy4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY2YvRm9ybURhdGFTdHJlYW1DRk5ldC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpjbG9zZUN1cnJlbnRTdHJlYW0pOiBBc3NlcnQgdGhhdCB3 ZSBoYWQgYWNxdWlyZWQgYSBsb2NrIHRvIGNsb3NlIHRoZSBzdHJlYW0uCisgICAgICAgIChXZWJD b3JlOjphZHZhbmNlQ3VycmVudFN0cmVhbSk6IEFzc2VydCB0aGF0IHdlIGhhZCBhY3F1aXJlZCBh IGxvY2sgdG8gYWR2YW5jZSB0aGUgc3RyZWFtLgorICAgICAgICAoV2ViQ29yZTo6b3Blbk5leHRT dHJlYW0pOiBBY3F1aXJlIGEgbG9jayBiZWZvcmUgd2Ugb3BlbiB0aGUgbmV4dCBzdHJlYW0gdG8g ZW5zdXJlIHRoYXQKKyAgICAgICAgZXhhY3RseSBvbmUgdGhyZWFkIGV4ZWN1dGVzIHRoaXMgY3Jp dGljYWwgc2VjdGlvbiBhdCBhIHRpbWUuCisgICAgICAgIChXZWJDb3JlOjpmb3JtRmluYWxpemUp OiBBY3F1aXJlIGEgbG9jayBiZWZvcmUgd2UgY2xvc2UgdGhlIGN1cnJlbnQgc3RyZWFtLgorICAg ICAgICAoV2ViQ29yZTo6Zm9ybUNsb3NlKTogRGl0dG8uCisKIDIwMTYtMDItMTIgIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIENTUDogJ3NhbmRib3gnIHNob3Vs ZCBiZSBpZ25vcmVkIGluIHJlcG9ydC1vbmx5IG1vZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvRm9ybURhdGFTdHJlYW1DRk5ldC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL0Zvcm1EYXRhU3RyZWFtQ0ZOZXQuY3BwCmluZGV4 IGMxMjY4MjRmMTY0MmRiMjQ1OTJiMThjMDFjNTc4ZWYwOWU2YWE2ODMuLjQ4NjEzM2NjODljOTlk NmIyNDA2NTMzMWE3MmM1ZDlhNGQwOGQ2ZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvY2YvRm9ybURhdGFTdHJlYW1DRk5ldC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9Gb3JtRGF0YVN0cmVhbUNGTmV0LmNwcApAQCAtMTA5 LDEwICsxMDksMTMgQEAgc3RydWN0IEZvcm1TdHJlYW1GaWVsZHMgewogICAgIENGUmVhZFN0cmVh bVJlZiBmb3JtU3RyZWFtOwogICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBzdHJlYW1MZW5ndGg7CiAg ICAgdW5zaWduZWQgbG9uZyBsb25nIGJ5dGVzU2VudDsKKyAgICBMb2NrIHN0cmVhbUlzQmVpbmdP cGVuZWRPckNsb3NlZExvY2s7CiB9OwogCiBzdGF0aWMgdm9pZCBjbG9zZUN1cnJlbnRTdHJlYW0o Rm9ybVN0cmVhbUZpZWxkcyogZm9ybSkKIHsKKyAgICBBU1NFUlQoZm9ybS0+c3RyZWFtSXNCZWlu Z09wZW5lZE9yQ2xvc2VkTG9jay5pc0hlbGQoKSk7CisKICAgICBpZiAoZm9ybS0+Y3VycmVudFN0 cmVhbSkgewogICAgICAgICBDRlJlYWRTdHJlYW1DbG9zZShmb3JtLT5jdXJyZW50U3RyZWFtKTsK ICAgICAgICAgQ0ZSZWFkU3RyZWFtU2V0Q2xpZW50KGZvcm0tPmN1cnJlbnRTdHJlYW0sIGtDRlN0 cmVhbUV2ZW50Tm9uZSwgMCwgMCk7CkBAIC0xMjcsNiArMTMwLDggQEAgc3RhdGljIHZvaWQgY2xv c2VDdXJyZW50U3RyZWFtKEZvcm1TdHJlYW1GaWVsZHMqIGZvcm0pCiAvLyBSZXR1cm4gZmFsc2Ug aWYgd2UgY2Fubm90IGFkdmFuY2UgdGhlIHN0cmVhbS4gQ3VycmVudGx5IHRoZSBvbmx5IHBvc3Np YmxlIGZhaWx1cmUgaXMgdGhhdCB0aGUgdW5kZXJseWluZyBmaWxlIGhhcyBiZWVuIHJlbW92ZWQg b3IgY2hhbmdlZCBzaW5jZSBGaWxlLnNsaWNlLgogc3RhdGljIGJvb2wgYWR2YW5jZUN1cnJlbnRT dHJlYW0oRm9ybVN0cmVhbUZpZWxkcyogZm9ybSkKIHsKKyAgICBBU1NFUlQoZm9ybS0+c3RyZWFt SXNCZWluZ09wZW5lZE9yQ2xvc2VkTG9jay5pc0hlbGQoKSk7CisKICAgICBjbG9zZUN1cnJlbnRT dHJlYW0oZm9ybSk7CiAKICAgICBpZiAoZm9ybS0+cmVtYWluaW5nRWxlbWVudHMuaXNFbXB0eSgp KQpAQCAtMTc2LDYgKzE4MSwxMCBAQCBzdGF0aWMgYm9vbCBhZHZhbmNlQ3VycmVudFN0cmVhbShG b3JtU3RyZWFtRmllbGRzKiBmb3JtKQogCiBzdGF0aWMgYm9vbCBvcGVuTmV4dFN0cmVhbShGb3Jt U3RyZWFtRmllbGRzKiBmb3JtKQogeworICAgIC8vIENGUmVhZFN0cmVhbU9wZW4oKSBjYW4gY2F1 c2UgdGhpcyBmdW5jdGlvbiB0byBiZSByZS1lbnRlcmVkIGZyb20gYW5vdGhlciB0aHJlYWQgYmVm b3JlIGl0IHJldHVybnMuCisgICAgLy8gT25lIGV4YW1wbGUgd2hlbiB0aGlzIGNhbiBvY2N1ciBp cyB3aGVuIHRoZSBzdHJlYW0gYmVpbmcgb3BlbmVkIGhhcyBubyBkYXRhLiBTZWUgPHJkYXI6Ly9w cm9ibGVtLzIzNTUwMjY5Pi4KKyAgICBMb2NrSG9sZGVyIGxvY2tlcihmb3JtLT5zdHJlYW1Jc0Jl aW5nT3BlbmVkT3JDbG9zZWRMb2NrKTsKKwogICAgIC8vIFNraXAgb3ZlciBhbnkgc3RyZWFtcyB3 ZSBjYW4ndCBvcGVuLgogICAgIGlmICghYWR2YW5jZUN1cnJlbnRTdHJlYW0oZm9ybSkpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKQEAgLTIxMyw3ICsyMjIsMTAgQEAgc3RhdGljIHZvaWQgZm9ybUZp bmFsaXplKENGUmVhZFN0cmVhbVJlZiBzdHJlYW0sIHZvaWQqIGNvbnRleHQpCiAgICAgQVNTRVJU X1VOVVNFRChzdHJlYW0sIGZvcm0tPmZvcm1TdHJlYW0gPT0gc3RyZWFtKTsKIAogICAgIGNhbGxP bk1haW5UaHJlYWQoW2Zvcm1dIHsKLSAgICAgICAgY2xvc2VDdXJyZW50U3RyZWFtKGZvcm0pOwor ICAgICAgICB7CisgICAgICAgICAgICBMb2NrSG9sZGVyIGxvY2tlcihmb3JtLT5zdHJlYW1Jc0Jl aW5nT3BlbmVkT3JDbG9zZWRMb2NrKTsKKyAgICAgICAgICAgIGNsb3NlQ3VycmVudFN0cmVhbShm b3JtKTsKKyAgICAgICAgfQogICAgICAgICBkZWxldGUgZm9ybTsKICAgICB9KTsKIH0KQEAgLTI4 MSw2ICsyOTMsNyBAQCBzdGF0aWMgQm9vbGVhbiBmb3JtQ2FuUmVhZChDRlJlYWRTdHJlYW1SZWYg c3RyZWFtLCB2b2lkKiBjb250ZXh0KQogc3RhdGljIHZvaWQgZm9ybUNsb3NlKENGUmVhZFN0cmVh bVJlZiwgdm9pZCogY29udGV4dCkKIHsKICAgICBGb3JtU3RyZWFtRmllbGRzKiBmb3JtID0gc3Rh dGljX2Nhc3Q8Rm9ybVN0cmVhbUZpZWxkcyo+KGNvbnRleHQpOworICAgIExvY2tIb2xkZXIgbG9j a2VyKGZvcm0tPnN0cmVhbUlzQmVpbmdPcGVuZWRPckNsb3NlZExvY2spOwogCiAgICAgY2xvc2VD dXJyZW50U3RyZWFtKGZvcm0pOwogfQo=