48805 2010-11-01 16:39:44 -0700 [Soup] Random crashes in http/tests/websocket/tests/workers/worker-handshake-challenge-randomness.html 2010-11-02 09:46:03 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 48815 1 mrobinson webkit-unassigned abarth eric webkit.review.bot xan.lopez oldest_to_newest 303066 0 mrobinson 2010-11-01 16:39:44 -0700 The GTK+ 64-bit Debug bot has seen random crashes. The issue appears to be that active websocket handes are tracked via memory address, which is a not reliable due to reallocations. 303071 1 72598 mrobinson 2010-11-01 16:48:43 -0700 Created attachment 72598 Patch for this issue 303078 2 72598 xan.lopez 2010-11-01 16:56:08 -0700 Comment on attachment 72598 Patch for this issue Looks good to me! 303099 3 mrobinson 2010-11-01 17:09:58 -0700 Committed r71080: <http://trac.webkit.org/changeset/71080> 303129 4 webkit.review.bot 2010-11-01 18:00:30 -0700 http://trac.webkit.org/changeset/71080 might have broken GTK Linux 64-bit Debug The following tests are not passing: http/tests/websocket/tests/alert-in-event-handler.html http/tests/websocket/tests/bad-handshake-crash.html http/tests/websocket/tests/bufferedAmount-after-close.html http/tests/websocket/tests/close-on-navigate-new-location.html http/tests/websocket/tests/close-on-unload-and-force-gc.html http/tests/websocket/tests/close-on-unload-reference-in-parent.html http/tests/websocket/tests/close-on-unload.html http/tests/websocket/tests/cross-origin.html http/tests/websocket/tests/error-detect.html http/tests/websocket/tests/frame-length-longer-than-buffer.html http/tests/websocket/tests/frame-length-overflow.html http/tests/websocket/tests/frame-length-skip.html http/tests/websocket/tests/frame-lengths.html http/tests/websocket/tests/handshake-challenge-randomness.html http/tests/websocket/tests/handshake-error.html http/tests/websocket/tests/handshake-fail-by-cross-origin.html http/tests/websocket/tests/handshake-fail-by-no-cr.html http/tests/websocket/tests/handshake-fail-by-sub-protocol-mismatch.html http/tests/websocket/tests/httponly-cookie.pl http/tests/websocket/tests/long-invalid-header.html 303207 5 72628 mrobinson 2010-11-01 21:37:49 -0700 Created attachment 72628 Updated patch which fixing HashMap assertion 303378 6 72628 xan.lopez 2010-11-02 08:39:17 -0700 Comment on attachment 72628 Updated patch which fixing HashMap assertion r=me 303387 7 mrobinson 2010-11-02 08:52:49 -0700 Committed r71119: <http://trac.webkit.org/changeset/71119> 303423 8 webkit.review.bot 2010-11-02 09:46:03 -0700 http://trac.webkit.org/changeset/71119 might have broken GTK Linux 64-bit Debug The following tests are not passing: fast/text/international/plane2.html 72598 2010-11-01 16:48:43 -0700 2010-11-01 21:37:45 -0700 Patch for this issue bug-48805-20101101164838.patch text/plain 9110 mrobinson ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MmI0ZjJjZGM2ZDlkMWExMjAxNTc2ZjAwZmI1NDIwMjVhYTZkOTYxYi4uYTQ5MjQ4NzBhYTJjZTM3 MTgxMmJkMDdiNTFjZTk4ODU1OTI4NzkxNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzNSBAQAogMjAxMC0xMS0wMSAgTWFy dGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1NvdXBdIFJhbmRvbSBjcmFzaGVzIGluIGh0 dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL3dvcmtlcnMvd29ya2VyLWhhbmRzaGFrZS1jaGFsbGVu Z2UtcmFuZG9tbmVzcy5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00ODgwNQorCisgICAgICAgIFRyYWNrIGFjdGl2ZSBXZWJTb2NrZXQgaGFuZGxl cyB2aWEgYSBzZXF1ZW50aWFsIGlkLiBUaGlzIGVuc3VyZXMKKyAgICAgICAgdGhhdCB3aGVuIGEg aGFuZGxlIGlzIHJlYWxsb2NhdGVkIGludG8gYSByZWNlbnRseSB1c2VkIHNlZ21lbnQgb2YKKyAg ICAgICAgbWVtb3J5LCBpdCBkb2Vzbid0IHRyaWdnZXIgYSBmYWxzZSBwb3NpdGl2ZSBpbiB0aGUg Y29kZSB3aGljaCBlbnN1cmVzCisgICAgICAgIHRoZSBvcmlnaW5hbCBoYW5kbGUgaXMgYWN0aXZl LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gVGhpcyB0ZXN0IHNob3VsZCBzdG9wIGNyYXNoaW5n IG9uIHRoZSBib3RzLCBwcm92aW5nIHRoZSBmaXguCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3 b3JrL3NvdXAvU29ja2V0U3RyZWFtSGFuZGxlLmg6CisgICAgICAgIChXZWJDb3JlOjpTb2NrZXRT dHJlYW1IYW5kbGU6OmlkKTogQWRkZWQgYW4gbV9pZCBtZW1iZXIgYW5kIGFjY2Vzc29yCisgICAg ICAgIHRvIFNvY2tldFN0cmVhbUhhbmRsZS4KKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3Nv dXAvU29ja2V0U3RyZWFtSGFuZGxlU291cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnZXRIYW5k bGVGcm9tSWQpOiBVcGRhdGVkIHRvIHdvcmsgd2l0aCBIYXNoTWFwIG9mIGhhbmRsZSBpZHMgdG8K KyAgICAgICAgU29ja2V0U3RyZWFtSGFuZGxlKi4KKyAgICAgICAgKFdlYkNvcmU6OmRlYWN0aXZh dGVIYW5kbGUpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OmFjdGl2YXRlSGFuZGxlKTogRGl0 dG8uCisgICAgICAgIChXZWJDb3JlOjpTb2NrZXRTdHJlYW1IYW5kbGU6OlNvY2tldFN0cmVhbUhh bmRsZSk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6U29ja2V0U3RyZWFtSGFuZGxlOjpjb25u ZWN0ZWQpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlNvY2tldFN0cmVhbUhhbmRsZTo6cmVh ZEJ5dGVzKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpTb2NrZXRTdHJlYW1IYW5kbGU6OmJl Z2luV2FpdGluZ0ZvclNvY2tldFdyaXRhYmlsaXR5KTogRGl0dG8uCisgICAgICAgIChXZWJDb3Jl Ojpjb25uZWN0ZWRDYWxsYmFjayk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6cmVhZFJlYWR5 Q2FsbGJhY2spOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OndyaXRlUmVhZHlDYWxsYmFjayk6 IERpdHRvLgorCisyMDEwLTExLTAxICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlh LmNvbT4KKwogICAgICAgICBSZXZpZXdlZCBieSBYYW4gTG9wZXouCiAKICAgICAgICAgW0dUS10g UGFzdGluZyBtYXJrdXAgaW50byBUaHVuZGVyYmlyZCBjb21wb3NlIHdpbmRvdyBwcm9kdWNlcyBu byB0ZXh0CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Tb2NrZXRT dHJlYW1IYW5kbGUuaCBiL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1NvY2tldFN0cmVh bUhhbmRsZS5oCmluZGV4IDJiYTQ1MDQ2ZGZlMTIzMmU1ZTJlYzRlMDAwN2QxZWJhNDA1MGQ3ZTQu LjA4ZDJkOTQ1YTY4YjcyNzk3YzdiYjFjYWVkOWQ3MmY0ODhjNTQ2YzIgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1NvY2tldFN0cmVhbUhhbmRsZS5oCisrKyBiL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1NvY2tldFN0cmVhbUhhbmRsZS5oCkBAIC01MSw2 ICs1MSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBjb25uZWN0ZWQoR1Nv Y2tldENvbm5lY3Rpb24qLCBHRXJyb3IqKTsKICAgICAgICAgdm9pZCByZWFkQnl0ZXMoc2lnbmVk IGxvbmcsIEdFcnJvciopOwogICAgICAgICB2b2lkIHdyaXRlUmVhZHkoKTsKKyAgICAgICAgdm9p ZCogaWQoKSB7IHJldHVybiBtX2lkOyB9CiAKICAgICBwcm90ZWN0ZWQ6CiAgICAgICAgIHZpcnR1 YWwgaW50IHBsYXRmb3JtU2VuZChjb25zdCBjaGFyKiBkYXRhLCBpbnQgbGVuZ3RoKTsKQEAgLTYy LDYgKzYzLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBQbGF0Zm9ybVJlZlB0cjxH T3V0cHV0U3RyZWFtPiBtX291dHB1dFN0cmVhbTsKICAgICAgICAgUGxhdGZvcm1SZWZQdHI8R1Nv dXJjZT4gbV93cml0ZVJlYWR5U291cmNlOwogICAgICAgICBjaGFyKiBtX3JlYWRCdWZmZXI7Cisg ICAgICAgIHZvaWQqIG1faWQ7CiAKICAgICAgICAgU29ja2V0U3RyZWFtSGFuZGxlKGNvbnN0IEtV UkwmLCBTb2NrZXRTdHJlYW1IYW5kbGVDbGllbnQqKTsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL3NvdXAvU29ja2V0U3RyZWFtSGFuZGxlU291cC5jcHAgYi9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvc291cC9Tb2NrZXRTdHJlYW1IYW5kbGVTb3VwLmNwcAppbmRleCBk NzNiNDk5YTQzM2MzYzRiNzA3YjMyZTJmOGM1ZWYwZGFlZWZjOTBjLi4yNTIwNjEwYmUxZjQyNGRh MjQwYzU4N2Y4ZTliODJlN2VjOGY4NmMzIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvc291cC9Tb2NrZXRTdHJlYW1IYW5kbGVTb3VwLmNwcAorKysgYi9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvc291cC9Tb2NrZXRTdHJlYW1IYW5kbGVTb3VwLmNwcApAQCAtNDgsMjUgKzQ4 LDMzIEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIC8vIFRoZXNlIGZ1bmN0aW9ucyBpbW1lZGlh dGVseSBjYWxsIHRoZSBzaW1pbGFybHkgbmFtZWQgU29ja2V0U3RyZWFtSGFuZGxlIG1ldGhvZHMu Ci1zdGF0aWMgdm9pZCBjb25uZWN0ZWRDYWxsYmFjayhHU29ja2V0Q2xpZW50KiwgR0FzeW5jUmVz dWx0KiwgU29ja2V0U3RyZWFtSGFuZGxlKik7Ci1zdGF0aWMgdm9pZCByZWFkUmVhZHlDYWxsYmFj ayhHSW5wdXRTdHJlYW0qLCBHQXN5bmNSZXN1bHQqLCBTb2NrZXRTdHJlYW1IYW5kbGUqKTsKLXN0 YXRpYyBnYm9vbGVhbiB3cml0ZVJlYWR5Q2FsbGJhY2soR1NvY2tldCosIEdJT0NvbmRpdGlvbiwg U29ja2V0U3RyZWFtSGFuZGxlKik7CitzdGF0aWMgdm9pZCBjb25uZWN0ZWRDYWxsYmFjayhHU29j a2V0Q2xpZW50KiwgR0FzeW5jUmVzdWx0Kiwgdm9pZCopOworc3RhdGljIHZvaWQgcmVhZFJlYWR5 Q2FsbGJhY2soR0lucHV0U3RyZWFtKiwgR0FzeW5jUmVzdWx0Kiwgdm9pZCopOworc3RhdGljIGdi b29sZWFuIHdyaXRlUmVhZHlDYWxsYmFjayhHU29ja2V0KiwgR0lPQ29uZGl0aW9uLCB2b2lkKik7 CiAKIC8vIEhhdmluZyBhIGxpc3Qgb2YgYWN0aXZlIGhhbmRsZXMgbWVhbnMgdGhhdCB3ZSBkbyBu b3QgaGF2ZSB0byB3b3JyeSBhYm91dCBXZWJDb3JlCiAvLyByZWZlcmVuY2UgY291bnRpbmcgaW4g R0xpYiBjYWxsYmFja3MuIE9uY2UgdGhlIGhhbmRsZSBpcyBvZmYgdGhlIGFjdGl2ZSBoYW5kbGVz IGxpc3QKIC8vIHdlIGp1c3QgaWdub3JlIGl0IGluIHRoZSBjYWxsYmFjay4gV2UgYXZvaWQgYSBs b3Qgb2YgZXh0cmEgY2hlY2tzIGFuZCB0cmlja3kKIC8vIHNpdHVhdGlvbnMgdGhpcyB3YXkuCi1z dGF0aWMgVmVjdG9yPFNvY2tldFN0cmVhbUhhbmRsZSo+IGdBY3RpdmVIYW5kbGVzOwotYm9vbCBp c0FjdGl2ZUhhbmRsZShTb2NrZXRTdHJlYW1IYW5kbGUqIGhhbmRsZSkKK3N0YXRpYyBIYXNoTWFw PHZvaWQqLCBTb2NrZXRTdHJlYW1IYW5kbGUqPiBnQWN0aXZlSGFuZGxlczsKK3N0YXRpYyBTb2Nr ZXRTdHJlYW1IYW5kbGUqIGdldEhhbmRsZUZyb21JZCh2b2lkKiBpZCkKIHsKLSAgICByZXR1cm4g Z0FjdGl2ZUhhbmRsZXMuZmluZChoYW5kbGUpICE9IG5vdEZvdW5kOworICAgIGlmICghZ0FjdGl2 ZUhhbmRsZXMuY29udGFpbnMoaWQpKQorICAgICAgICByZXR1cm4gMDsKKyAgICByZXR1cm4gZ0Fj dGl2ZUhhbmRsZXMuZ2V0KGlkKTsKIH0KIAotdm9pZCBkZWFjdGl2YXRlSGFuZGxlKFNvY2tldFN0 cmVhbUhhbmRsZSogaGFuZGxlKQorc3RhdGljIHZvaWQgZGVhY3RpdmF0ZUhhbmRsZShTb2NrZXRT dHJlYW1IYW5kbGUqIGhhbmRsZSkKIHsKLSAgICBzaXplX3QgaGFuZGxlSW5kZXggPSBnQWN0aXZl SGFuZGxlcy5maW5kKGhhbmRsZSk7Ci0gICAgaWYgKGhhbmRsZUluZGV4ICE9IG5vdEZvdW5kKQot ICAgICAgICBnQWN0aXZlSGFuZGxlcy5yZW1vdmUoaGFuZGxlSW5kZXgpOworICAgIGdBY3RpdmVI YW5kbGVzLnJlbW92ZShoYW5kbGUtPmlkKCkpOworfQorCitzdGF0aWMgdm9pZCogYWN0aXZhdGVI YW5kbGUoU29ja2V0U3RyZWFtSGFuZGxlKiBoYW5kbGUpCit7CisgICAgc3RhdGljIGdpbnQgY3Vy cmVudEhhbmRsZUlkID0gMDsKKyAgICB2b2lkKiBpZCA9IEdJTlRfVE9fUE9JTlRFUihjdXJyZW50 SGFuZGxlSWQrKyk7CisgICAgZ0FjdGl2ZUhhbmRsZXMuc2V0KGlkLCBoYW5kbGUpOworICAgIHJl dHVybiBpZDsKIH0KIAogU29ja2V0U3RyZWFtSGFuZGxlOjpTb2NrZXRTdHJlYW1IYW5kbGUoY29u c3QgS1VSTCYgdXJsLCBTb2NrZXRTdHJlYW1IYW5kbGVDbGllbnQqIGNsaWVudCkKQEAgLTc4LDEw ICs4NiwxMCBAQCBTb2NrZXRTdHJlYW1IYW5kbGU6OlNvY2tldFN0cmVhbUhhbmRsZShjb25zdCBL VVJMJiB1cmwsIFNvY2tldFN0cmVhbUhhbmRsZUNsaWVudAogICAgICAgICByZXR1cm47CiAgICAg dW5zaWduZWQgaW50IHBvcnQgPSB1cmwuaGFzUG9ydCgpID8gdXJsLnBvcnQoKSA6IDgwOwogCi0g ICAgZ0FjdGl2ZUhhbmRsZXMuYXBwZW5kKHRoaXMpOworICAgIG1faWQgPSBhY3RpdmF0ZUhhbmRs ZSh0aGlzKTsKICAgICBQbGF0Zm9ybVJlZlB0cjxHU29ja2V0Q2xpZW50PiBzb2NrZXRDbGllbnQg PSBhZG9wdFBsYXRmb3JtUmVmKGdfc29ja2V0X2NsaWVudF9uZXcoKSk7CiAgICAgZ19zb2NrZXRf Y2xpZW50X2Nvbm5lY3RfdG9faG9zdF9hc3luYyhzb2NrZXRDbGllbnQuZ2V0KCksIHVybC5ob3N0 KCkudXRmOCgpLmRhdGEoKSwgcG9ydCwgMCwKLSAgICAgICAgcmVpbnRlcnByZXRfY2FzdDxHQXN5 bmNSZWFkeUNhbGxiYWNrPihjb25uZWN0ZWRDYWxsYmFjayksIHRoaXMpOworICAgICAgICByZWlu dGVycHJldF9jYXN0PEdBc3luY1JlYWR5Q2FsbGJhY2s+KGNvbm5lY3RlZENhbGxiYWNrKSwgbV9p ZCk7CiB9CiAKIFNvY2tldFN0cmVhbUhhbmRsZTo6flNvY2tldFN0cmVhbUhhbmRsZSgpCkBAIC0x MDQsNyArMTEyLDcgQEAgdm9pZCBTb2NrZXRTdHJlYW1IYW5kbGU6OmNvbm5lY3RlZChHU29ja2V0 Q29ubmVjdGlvbiogc29ja2V0Q29ubmVjdGlvbiwgR0Vycm9yKgogCiAgICAgbV9yZWFkQnVmZmVy ID0gbmV3IGNoYXJbUkVBRF9CVUZGRVJfU0laRV07CiAgICAgZ19pbnB1dF9zdHJlYW1fcmVhZF9h c3luYyhtX2lucHV0U3RyZWFtLmdldCgpLCBtX3JlYWRCdWZmZXIsIFJFQURfQlVGRkVSX1NJWkUs IEdfUFJJT1JJVFlfREVGQVVMVCwgMCwKLSAgICAgICAgcmVpbnRlcnByZXRfY2FzdDxHQXN5bmNS ZWFkeUNhbGxiYWNrPihyZWFkUmVhZHlDYWxsYmFjayksIHRoaXMpOworICAgICAgICByZWludGVy cHJldF9jYXN0PEdBc3luY1JlYWR5Q2FsbGJhY2s+KHJlYWRSZWFkeUNhbGxiYWNrKSwgbV9pZCk7 CiAKICAgICAvLyBUaGUgY2xpZW50IGNhbiBjbG9zZSB0aGUgaGFuZGxlLCBwb3RlbnRpYWxseSBy ZW1vdmluZyB0aGUgbGFzdCByZWZlcmVuY2UuCiAgICAgUmVmUHRyPFNvY2tldFN0cmVhbUhhbmRs ZT4gcHJvdGVjdCh0aGlzKTsgCkBAIC0xMzEsNyArMTM5LDcgQEAgdm9pZCBTb2NrZXRTdHJlYW1I YW5kbGU6OnJlYWRCeXRlcyhzaWduZWQgbG9uZyBieXRlc1JlYWQsIEdFcnJvciogZXJyb3IpCiAg ICAgbV9jbGllbnQtPmRpZFJlY2VpdmVEYXRhKHRoaXMsIG1fcmVhZEJ1ZmZlciwgYnl0ZXNSZWFk KTsKICAgICBpZiAobV9pbnB1dFN0cmVhbSkgLy8gVGhlIGNsaWVudCBtYXkgaGF2ZSBjbG9zZWQg dGhlIGNvbm5lY3Rpb24uCiAgICAgICAgIGdfaW5wdXRfc3RyZWFtX3JlYWRfYXN5bmMobV9pbnB1 dFN0cmVhbS5nZXQoKSwgbV9yZWFkQnVmZmVyLCBSRUFEX0JVRkZFUl9TSVpFLCBHX1BSSU9SSVRZ X0RFRkFVTFQsIDAsCi0gICAgICAgICAgICByZWludGVycHJldF9jYXN0PEdBc3luY1JlYWR5Q2Fs bGJhY2s+KHJlYWRSZWFkeUNhbGxiYWNrKSwgdGhpcyk7CisgICAgICAgICAgICByZWludGVycHJl dF9jYXN0PEdBc3luY1JlYWR5Q2FsbGJhY2s+KHJlYWRSZWFkeUNhbGxiYWNrKSwgbV9pZCk7CiB9 CiAKIHZvaWQgU29ja2V0U3RyZWFtSGFuZGxlOjp3cml0ZVJlYWR5KCkKQEAgLTIxNSw3ICsyMjMs NyBAQCB2b2lkIFNvY2tldFN0cmVhbUhhbmRsZTo6YmVnaW5XYWl0aW5nRm9yU29ja2V0V3JpdGFi aWxpdHkoKQogCiAgICAgbV93cml0ZVJlYWR5U291cmNlID0gYWRvcHRQbGF0Zm9ybVJlZihnX3Nv Y2tldF9jcmVhdGVfc291cmNlKAogICAgICAgICBnX3NvY2tldF9jb25uZWN0aW9uX2dldF9zb2Nr ZXQobV9zb2NrZXRDb25uZWN0aW9uLmdldCgpKSwgc3RhdGljX2Nhc3Q8R0lPQ29uZGl0aW9uPihH X0lPX09VVCksIDApKTsKLSAgICBnX3NvdXJjZV9zZXRfY2FsbGJhY2sobV93cml0ZVJlYWR5U291 cmNlLmdldCgpLCByZWludGVycHJldF9jYXN0PEdTb3VyY2VGdW5jPih3cml0ZVJlYWR5Q2FsbGJh Y2spLCB0aGlzLCAwKTsKKyAgICBnX3NvdXJjZV9zZXRfY2FsbGJhY2sobV93cml0ZVJlYWR5U291 cmNlLmdldCgpLCByZWludGVycHJldF9jYXN0PEdTb3VyY2VGdW5jPih3cml0ZVJlYWR5Q2FsbGJh Y2spLCBtX2lkLCAwKTsKICAgICBnX3NvdXJjZV9hdHRhY2gobV93cml0ZVJlYWR5U291cmNlLmdl dCgpLCAwKTsKIH0KIApAQCAtMjI4LDE0ICsyMzYsMTUgQEAgdm9pZCBTb2NrZXRTdHJlYW1IYW5k bGU6OnN0b3BXYWl0aW5nRm9yU29ja2V0V3JpdGFiaWxpdHkoKQogICAgIG1fd3JpdGVSZWFkeVNv dXJjZSA9IDA7CiB9CiAKLXN0YXRpYyB2b2lkIGNvbm5lY3RlZENhbGxiYWNrKEdTb2NrZXRDbGll bnQqIGNsaWVudCwgR0FzeW5jUmVzdWx0KiByZXN1bHQsIFNvY2tldFN0cmVhbUhhbmRsZSogaGFu ZGxlKQorc3RhdGljIHZvaWQgY29ubmVjdGVkQ2FsbGJhY2soR1NvY2tldENsaWVudCogY2xpZW50 LCBHQXN5bmNSZXN1bHQqIHJlc3VsdCwgdm9pZCogaWQpCiB7CiAgICAgLy8gQWx3YXlzIGZpbmlz aCB0aGUgY29ubmVjdGlvbiwgZXZlbiBpZiB0aGlzIFNvY2tldFN0cmVhbUhhbmRsZSB3YXMgZGVh Y3RpdmF0ZWQgZWFybGllci4KICAgICBHT3duUHRyPEdFcnJvcj4gZXJyb3I7CiAgICAgR1NvY2tl dENvbm5lY3Rpb24qIHNvY2tldENvbm5lY3Rpb24gPSBnX3NvY2tldF9jbGllbnRfY29ubmVjdF90 b19ob3N0X2ZpbmlzaChjbGllbnQsIHJlc3VsdCwgJmVycm9yLm91dFB0cigpKTsKIAogICAgIC8v IFRoZSBTb2NrZXRTdHJlYW1IYW5kbGUgaGFzIGJlZW4gZGVhY3RpdmF0ZWQsIHNvIGp1c3QgY2xv c2UgdGhlIGNvbm5lY3Rpb24sIGlnbm9yaW5nIGVycm9ycy4KLSAgICBpZiAoIWlzQWN0aXZlSGFu ZGxlKGhhbmRsZSkpIHsKKyAgICBTb2NrZXRTdHJlYW1IYW5kbGUqIGhhbmRsZSA9IGdldEhhbmRs ZUZyb21JZChpZCk7CisgICAgaWYgKCFoYW5kbGUpIHsKICAgICAgICAgZ19pb19zdHJlYW1fY2xv c2UoR19JT19TVFJFQU0oc29ja2V0Q29ubmVjdGlvbiksIDAsICZlcnJvci5vdXRQdHIoKSk7CiAg ICAgICAgIHJldHVybjsKICAgICB9CkBAIC0yNDMsMjAgKzI1MiwyMyBAQCBzdGF0aWMgdm9pZCBj b25uZWN0ZWRDYWxsYmFjayhHU29ja2V0Q2xpZW50KiBjbGllbnQsIEdBc3luY1Jlc3VsdCogcmVz dWx0LCBTb2NrZQogICAgIGhhbmRsZS0+Y29ubmVjdGVkKHNvY2tldENvbm5lY3Rpb24sIGVycm9y LmdldCgpKTsKIH0KIAotc3RhdGljIHZvaWQgcmVhZFJlYWR5Q2FsbGJhY2soR0lucHV0U3RyZWFt KiBzdHJlYW0sIEdBc3luY1Jlc3VsdCogcmVzdWx0LCBTb2NrZXRTdHJlYW1IYW5kbGUqIGhhbmRs ZSkKK3N0YXRpYyB2b2lkIHJlYWRSZWFkeUNhbGxiYWNrKEdJbnB1dFN0cmVhbSogc3RyZWFtLCBH QXN5bmNSZXN1bHQqIHJlc3VsdCwgdm9pZCogaWQpCiB7CiAgICAgLy8gQWx3YXlzIGZpbmlzaCB0 aGUgcmVhZCwgZXZlbiBpZiB0aGlzIFNvY2tldFN0cmVhbUhhbmRsZSB3YXMgZGVhY3RpdmF0ZWQg ZWFybGllci4KICAgICBHT3duUHRyPEdFcnJvcj4gZXJyb3I7CiAgICAgZ3NzaXplIGJ5dGVzUmVh ZCA9IGdfaW5wdXRfc3RyZWFtX3JlYWRfZmluaXNoKHN0cmVhbSwgcmVzdWx0LCAmZXJyb3Iub3V0 UHRyKCkpOwogCi0gICAgaWYgKCFpc0FjdGl2ZUhhbmRsZShoYW5kbGUpKQorICAgIFNvY2tldFN0 cmVhbUhhbmRsZSogaGFuZGxlID0gZ2V0SGFuZGxlRnJvbUlkKGlkKTsKKyAgICBpZiAoIWhhbmRs ZSkKICAgICAgICAgcmV0dXJuOworCiAgICAgaGFuZGxlLT5yZWFkQnl0ZXMoYnl0ZXNSZWFkLCBl cnJvci5nZXQoKSk7CiB9CiAKLXN0YXRpYyBnYm9vbGVhbiB3cml0ZVJlYWR5Q2FsbGJhY2soR1Nv Y2tldCosIEdJT0NvbmRpdGlvbiBjb25kaXRpb24sIFNvY2tldFN0cmVhbUhhbmRsZSogaGFuZGxl KQorc3RhdGljIGdib29sZWFuIHdyaXRlUmVhZHlDYWxsYmFjayhHU29ja2V0KiwgR0lPQ29uZGl0 aW9uIGNvbmRpdGlvbiwgdm9pZCogaWQpCiB7Ci0gICAgaWYgKCFpc0FjdGl2ZUhhbmRsZShoYW5k bGUpKQorICAgIFNvY2tldFN0cmVhbUhhbmRsZSogaGFuZGxlID0gZ2V0SGFuZGxlRnJvbUlkKGlk KTsKKyAgICBpZiAoIWhhbmRsZSkKICAgICAgICAgcmV0dXJuIEZBTFNFOwogCiAgICAgLy8gR19J T19IVVAgYW5kIEdfSU9fRVJSIGFyZSBhcmUgYWx3YXlzIGFjdGl2ZS4gU2VlOgo= 72628 2010-11-01 21:37:49 -0700 2010-11-02 08:39:17 -0700 Updated patch which fixing HashMap assertion bug-48805-20101101213747.patch text/plain 9173 mrobinson ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MjdjYmZiMDM1MWY2YWFkYjMwNTEzNDM4ODg4YTE1MTlkZjJmNDZmNy4uZjU1NzcyNzRhMmUzZTMx YTIwMDU0MTQzMDUxOTc0ZDA0NDZlNjRmYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzNSBAQAogMjAxMC0xMS0wMSAgTWFy dGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKKyAgICAgICAgUmV2aWV3ZWQg YnkgWGFuIExvcGV6LgorCisgICAgICAgIFtTb3VwXSBSYW5kb20gY3Jhc2hlcyBpbiBodHRwL3Rl c3RzL3dlYnNvY2tldC90ZXN0cy93b3JrZXJzL3dvcmtlci1oYW5kc2hha2UtY2hhbGxlbmdlLXJh bmRvbW5lc3MuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NDg4MDUKKworICAgICAgICBUcmFjayBhY3RpdmUgV2ViU29ja2V0IGhhbmRsZXMgdmlh IGEgc2VxdWVudGlhbCBpZC4gVGhpcyBlbnN1cmVzCisgICAgICAgIHRoYXQgd2hlbiBhIGhhbmRs ZSBpcyByZWFsbG9jYXRlZCBpbnRvIGEgcmVjZW50bHkgdXNlZCBzZWdtZW50IG9mCisgICAgICAg IG1lbW9yeSwgaXQgZG9lc24ndCB0cmlnZ2VyIGEgZmFsc2UgcG9zaXRpdmUgaW4gdGhlIGNvZGUg d2hpY2ggZW5zdXJlcworICAgICAgICB0aGUgb3JpZ2luYWwgaGFuZGxlIGlzIGFjdGl2ZS4KKwor ICAgICAgICBObyBuZXcgdGVzdHMuIFRoaXMgdGVzdCBzaG91bGQgc3RvcCBjcmFzaGluZyBvbiB0 aGUgYm90cywgcHJvdmluZyB0aGUgZml4LgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9z b3VwL1NvY2tldFN0cmVhbUhhbmRsZS5oOgorICAgICAgICAoV2ViQ29yZTo6U29ja2V0U3RyZWFt SGFuZGxlOjppZCk6IEFkZGVkIGFuIG1faWQgbWVtYmVyIGFuZCBhY2Nlc3NvcgorICAgICAgICB0 byBTb2NrZXRTdHJlYW1IYW5kbGUuCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9zb3VwL1Nv Y2tldFN0cmVhbUhhbmRsZVNvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Z2V0SGFuZGxlRnJv bUlkKTogVXBkYXRlZCB0byB3b3JrIHdpdGggSGFzaE1hcCBvZiBoYW5kbGUgaWRzIHRvCisgICAg ICAgIFNvY2tldFN0cmVhbUhhbmRsZSouCisgICAgICAgIChXZWJDb3JlOjpkZWFjdGl2YXRlSGFu ZGxlKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjphY3RpdmF0ZUhhbmRsZSk6IERpdHRvLgor ICAgICAgICAoV2ViQ29yZTo6U29ja2V0U3RyZWFtSGFuZGxlOjpTb2NrZXRTdHJlYW1IYW5kbGUp OiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlNvY2tldFN0cmVhbUhhbmRsZTo6Y29ubmVjdGVk KTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpTb2NrZXRTdHJlYW1IYW5kbGU6OnJlYWRCeXRl cyk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6U29ja2V0U3RyZWFtSGFuZGxlOjpiZWdpbldh aXRpbmdGb3JTb2NrZXRXcml0YWJpbGl0eSk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6Y29u bmVjdGVkQ2FsbGJhY2spOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OnJlYWRSZWFkeUNhbGxi YWNrKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjp3cml0ZVJlYWR5Q2FsbGJhY2spOiBEaXR0 by4KKworMjAxMC0xMS0wMSAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+ CisKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuaWVsIEJhdGVzLgogCiAgICAgICAgIFtHVEtdIFBv cHVwTWVudUd0ayBoYXMgYSB2ZXJ5IGNvbmZ1c2luZyBpZi1lbHNlIGJsb2NrCmRpZmYgLS1naXQg YS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Tb2NrZXRTdHJlYW1IYW5kbGUuaCBiL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1NvY2tldFN0cmVhbUhhbmRsZS5oCmluZGV4IDJi YTQ1MDQ2ZGZlMTIzMmU1ZTJlYzRlMDAwN2QxZWJhNDA1MGQ3ZTQuLjA4ZDJkOTQ1YTY4YjcyNzk3 YzdiYjFjYWVkOWQ3MmY0ODhjNTQ2YzIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9zb3VwL1NvY2tldFN0cmVhbUhhbmRsZS5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9zb3VwL1NvY2tldFN0cmVhbUhhbmRsZS5oCkBAIC01MSw2ICs1MSw3IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBjb25uZWN0ZWQoR1NvY2tldENvbm5lY3Rpb24qLCBH RXJyb3IqKTsKICAgICAgICAgdm9pZCByZWFkQnl0ZXMoc2lnbmVkIGxvbmcsIEdFcnJvciopOwog ICAgICAgICB2b2lkIHdyaXRlUmVhZHkoKTsKKyAgICAgICAgdm9pZCogaWQoKSB7IHJldHVybiBt X2lkOyB9CiAKICAgICBwcm90ZWN0ZWQ6CiAgICAgICAgIHZpcnR1YWwgaW50IHBsYXRmb3JtU2Vu ZChjb25zdCBjaGFyKiBkYXRhLCBpbnQgbGVuZ3RoKTsKQEAgLTYyLDYgKzYzLDcgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogICAgICAgICBQbGF0Zm9ybVJlZlB0cjxHT3V0cHV0U3RyZWFtPiBtX291 dHB1dFN0cmVhbTsKICAgICAgICAgUGxhdGZvcm1SZWZQdHI8R1NvdXJjZT4gbV93cml0ZVJlYWR5 U291cmNlOwogICAgICAgICBjaGFyKiBtX3JlYWRCdWZmZXI7CisgICAgICAgIHZvaWQqIG1faWQ7 CiAKICAgICAgICAgU29ja2V0U3RyZWFtSGFuZGxlKGNvbnN0IEtVUkwmLCBTb2NrZXRTdHJlYW1I YW5kbGVDbGllbnQqKTsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3Nv dXAvU29ja2V0U3RyZWFtSGFuZGxlU291cC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv c291cC9Tb2NrZXRTdHJlYW1IYW5kbGVTb3VwLmNwcAppbmRleCBkNzNiNDk5YTQzM2MzYzRiNzA3 YjMyZTJmOGM1ZWYwZGFlZWZjOTBjLi43ZGY3MmE0YWZiOWI5NWQ2NDBlN2Q5YjA5NzAwODMyNGFk NDE5ZDk4IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Tb2NrZXRT dHJlYW1IYW5kbGVTb3VwLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9T b2NrZXRTdHJlYW1IYW5kbGVTb3VwLmNwcApAQCAtNDgsMjUgKzQ4LDM0IEBACiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKIC8vIFRoZXNlIGZ1bmN0aW9ucyBpbW1lZGlhdGVseSBjYWxsIHRoZSBzaW1p bGFybHkgbmFtZWQgU29ja2V0U3RyZWFtSGFuZGxlIG1ldGhvZHMuCi1zdGF0aWMgdm9pZCBjb25u ZWN0ZWRDYWxsYmFjayhHU29ja2V0Q2xpZW50KiwgR0FzeW5jUmVzdWx0KiwgU29ja2V0U3RyZWFt SGFuZGxlKik7Ci1zdGF0aWMgdm9pZCByZWFkUmVhZHlDYWxsYmFjayhHSW5wdXRTdHJlYW0qLCBH QXN5bmNSZXN1bHQqLCBTb2NrZXRTdHJlYW1IYW5kbGUqKTsKLXN0YXRpYyBnYm9vbGVhbiB3cml0 ZVJlYWR5Q2FsbGJhY2soR1NvY2tldCosIEdJT0NvbmRpdGlvbiwgU29ja2V0U3RyZWFtSGFuZGxl Kik7CitzdGF0aWMgdm9pZCBjb25uZWN0ZWRDYWxsYmFjayhHU29ja2V0Q2xpZW50KiwgR0FzeW5j UmVzdWx0Kiwgdm9pZCopOworc3RhdGljIHZvaWQgcmVhZFJlYWR5Q2FsbGJhY2soR0lucHV0U3Ry ZWFtKiwgR0FzeW5jUmVzdWx0Kiwgdm9pZCopOworc3RhdGljIGdib29sZWFuIHdyaXRlUmVhZHlD YWxsYmFjayhHU29ja2V0KiwgR0lPQ29uZGl0aW9uLCB2b2lkKik7CiAKIC8vIEhhdmluZyBhIGxp c3Qgb2YgYWN0aXZlIGhhbmRsZXMgbWVhbnMgdGhhdCB3ZSBkbyBub3QgaGF2ZSB0byB3b3JyeSBh Ym91dCBXZWJDb3JlCiAvLyByZWZlcmVuY2UgY291bnRpbmcgaW4gR0xpYiBjYWxsYmFja3MuIE9u Y2UgdGhlIGhhbmRsZSBpcyBvZmYgdGhlIGFjdGl2ZSBoYW5kbGVzIGxpc3QKIC8vIHdlIGp1c3Qg aWdub3JlIGl0IGluIHRoZSBjYWxsYmFjay4gV2UgYXZvaWQgYSBsb3Qgb2YgZXh0cmEgY2hlY2tz IGFuZCB0cmlja3kKIC8vIHNpdHVhdGlvbnMgdGhpcyB3YXkuCi1zdGF0aWMgVmVjdG9yPFNvY2tl dFN0cmVhbUhhbmRsZSo+IGdBY3RpdmVIYW5kbGVzOwotYm9vbCBpc0FjdGl2ZUhhbmRsZShTb2Nr ZXRTdHJlYW1IYW5kbGUqIGhhbmRsZSkKK3N0YXRpYyBIYXNoTWFwPHZvaWQqLCBTb2NrZXRTdHJl YW1IYW5kbGUqPiBnQWN0aXZlSGFuZGxlczsKK3N0YXRpYyBTb2NrZXRTdHJlYW1IYW5kbGUqIGdl dEhhbmRsZUZyb21JZCh2b2lkKiBpZCkKIHsKLSAgICByZXR1cm4gZ0FjdGl2ZUhhbmRsZXMuZmlu ZChoYW5kbGUpICE9IG5vdEZvdW5kOworICAgIGlmICghZ0FjdGl2ZUhhbmRsZXMuY29udGFpbnMo aWQpKQorICAgICAgICByZXR1cm4gMDsKKyAgICByZXR1cm4gZ0FjdGl2ZUhhbmRsZXMuZ2V0KGlk KTsKIH0KIAotdm9pZCBkZWFjdGl2YXRlSGFuZGxlKFNvY2tldFN0cmVhbUhhbmRsZSogaGFuZGxl KQorc3RhdGljIHZvaWQgZGVhY3RpdmF0ZUhhbmRsZShTb2NrZXRTdHJlYW1IYW5kbGUqIGhhbmRs ZSkKIHsKLSAgICBzaXplX3QgaGFuZGxlSW5kZXggPSBnQWN0aXZlSGFuZGxlcy5maW5kKGhhbmRs ZSk7Ci0gICAgaWYgKGhhbmRsZUluZGV4ICE9IG5vdEZvdW5kKQotICAgICAgICBnQWN0aXZlSGFu ZGxlcy5yZW1vdmUoaGFuZGxlSW5kZXgpOworICAgIGdBY3RpdmVIYW5kbGVzLnJlbW92ZShoYW5k bGUtPmlkKCkpOworfQorCitzdGF0aWMgdm9pZCogYWN0aXZhdGVIYW5kbGUoU29ja2V0U3RyZWFt SGFuZGxlKiBoYW5kbGUpCit7CisgICAgLy8gVGhlIGZpcnN0IGlkIGNhbm5vdCBiZSAwLCBiZWNh dXNlIGNvbmZsaWN0cyB3aXRoIHRoZSBIYXNoTWFwIGVtcHR5VmFsdWUuCisgICAgc3RhdGljIGdp bnQgY3VycmVudEhhbmRsZUlkID0gMTsKKyAgICB2b2lkKiBpZCA9IEdJTlRfVE9fUE9JTlRFUihj dXJyZW50SGFuZGxlSWQrKyk7CisgICAgZ0FjdGl2ZUhhbmRsZXMuc2V0KGlkLCBoYW5kbGUpOwor ICAgIHJldHVybiBpZDsKIH0KIAogU29ja2V0U3RyZWFtSGFuZGxlOjpTb2NrZXRTdHJlYW1IYW5k bGUoY29uc3QgS1VSTCYgdXJsLCBTb2NrZXRTdHJlYW1IYW5kbGVDbGllbnQqIGNsaWVudCkKQEAg LTc4LDEwICs4NywxMCBAQCBTb2NrZXRTdHJlYW1IYW5kbGU6OlNvY2tldFN0cmVhbUhhbmRsZShj b25zdCBLVVJMJiB1cmwsIFNvY2tldFN0cmVhbUhhbmRsZUNsaWVudAogICAgICAgICByZXR1cm47 CiAgICAgdW5zaWduZWQgaW50IHBvcnQgPSB1cmwuaGFzUG9ydCgpID8gdXJsLnBvcnQoKSA6IDgw OwogCi0gICAgZ0FjdGl2ZUhhbmRsZXMuYXBwZW5kKHRoaXMpOworICAgIG1faWQgPSBhY3RpdmF0 ZUhhbmRsZSh0aGlzKTsKICAgICBQbGF0Zm9ybVJlZlB0cjxHU29ja2V0Q2xpZW50PiBzb2NrZXRD bGllbnQgPSBhZG9wdFBsYXRmb3JtUmVmKGdfc29ja2V0X2NsaWVudF9uZXcoKSk7CiAgICAgZ19z b2NrZXRfY2xpZW50X2Nvbm5lY3RfdG9faG9zdF9hc3luYyhzb2NrZXRDbGllbnQuZ2V0KCksIHVy bC5ob3N0KCkudXRmOCgpLmRhdGEoKSwgcG9ydCwgMCwKLSAgICAgICAgcmVpbnRlcnByZXRfY2Fz dDxHQXN5bmNSZWFkeUNhbGxiYWNrPihjb25uZWN0ZWRDYWxsYmFjayksIHRoaXMpOworICAgICAg ICByZWludGVycHJldF9jYXN0PEdBc3luY1JlYWR5Q2FsbGJhY2s+KGNvbm5lY3RlZENhbGxiYWNr KSwgbV9pZCk7CiB9CiAKIFNvY2tldFN0cmVhbUhhbmRsZTo6flNvY2tldFN0cmVhbUhhbmRsZSgp CkBAIC0xMDQsNyArMTEzLDcgQEAgdm9pZCBTb2NrZXRTdHJlYW1IYW5kbGU6OmNvbm5lY3RlZChH U29ja2V0Q29ubmVjdGlvbiogc29ja2V0Q29ubmVjdGlvbiwgR0Vycm9yKgogCiAgICAgbV9yZWFk QnVmZmVyID0gbmV3IGNoYXJbUkVBRF9CVUZGRVJfU0laRV07CiAgICAgZ19pbnB1dF9zdHJlYW1f cmVhZF9hc3luYyhtX2lucHV0U3RyZWFtLmdldCgpLCBtX3JlYWRCdWZmZXIsIFJFQURfQlVGRkVS X1NJWkUsIEdfUFJJT1JJVFlfREVGQVVMVCwgMCwKLSAgICAgICAgcmVpbnRlcnByZXRfY2FzdDxH QXN5bmNSZWFkeUNhbGxiYWNrPihyZWFkUmVhZHlDYWxsYmFjayksIHRoaXMpOworICAgICAgICBy ZWludGVycHJldF9jYXN0PEdBc3luY1JlYWR5Q2FsbGJhY2s+KHJlYWRSZWFkeUNhbGxiYWNrKSwg bV9pZCk7CiAKICAgICAvLyBUaGUgY2xpZW50IGNhbiBjbG9zZSB0aGUgaGFuZGxlLCBwb3RlbnRp YWxseSByZW1vdmluZyB0aGUgbGFzdCByZWZlcmVuY2UuCiAgICAgUmVmUHRyPFNvY2tldFN0cmVh bUhhbmRsZT4gcHJvdGVjdCh0aGlzKTsgCkBAIC0xMzEsNyArMTQwLDcgQEAgdm9pZCBTb2NrZXRT dHJlYW1IYW5kbGU6OnJlYWRCeXRlcyhzaWduZWQgbG9uZyBieXRlc1JlYWQsIEdFcnJvciogZXJy b3IpCiAgICAgbV9jbGllbnQtPmRpZFJlY2VpdmVEYXRhKHRoaXMsIG1fcmVhZEJ1ZmZlciwgYnl0 ZXNSZWFkKTsKICAgICBpZiAobV9pbnB1dFN0cmVhbSkgLy8gVGhlIGNsaWVudCBtYXkgaGF2ZSBj bG9zZWQgdGhlIGNvbm5lY3Rpb24uCiAgICAgICAgIGdfaW5wdXRfc3RyZWFtX3JlYWRfYXN5bmMo bV9pbnB1dFN0cmVhbS5nZXQoKSwgbV9yZWFkQnVmZmVyLCBSRUFEX0JVRkZFUl9TSVpFLCBHX1BS SU9SSVRZX0RFRkFVTFQsIDAsCi0gICAgICAgICAgICByZWludGVycHJldF9jYXN0PEdBc3luY1Jl YWR5Q2FsbGJhY2s+KHJlYWRSZWFkeUNhbGxiYWNrKSwgdGhpcyk7CisgICAgICAgICAgICByZWlu dGVycHJldF9jYXN0PEdBc3luY1JlYWR5Q2FsbGJhY2s+KHJlYWRSZWFkeUNhbGxiYWNrKSwgbV9p ZCk7CiB9CiAKIHZvaWQgU29ja2V0U3RyZWFtSGFuZGxlOjp3cml0ZVJlYWR5KCkKQEAgLTIxNSw3 ICsyMjQsNyBAQCB2b2lkIFNvY2tldFN0cmVhbUhhbmRsZTo6YmVnaW5XYWl0aW5nRm9yU29ja2V0 V3JpdGFiaWxpdHkoKQogCiAgICAgbV93cml0ZVJlYWR5U291cmNlID0gYWRvcHRQbGF0Zm9ybVJl ZihnX3NvY2tldF9jcmVhdGVfc291cmNlKAogICAgICAgICBnX3NvY2tldF9jb25uZWN0aW9uX2dl dF9zb2NrZXQobV9zb2NrZXRDb25uZWN0aW9uLmdldCgpKSwgc3RhdGljX2Nhc3Q8R0lPQ29uZGl0 aW9uPihHX0lPX09VVCksIDApKTsKLSAgICBnX3NvdXJjZV9zZXRfY2FsbGJhY2sobV93cml0ZVJl YWR5U291cmNlLmdldCgpLCByZWludGVycHJldF9jYXN0PEdTb3VyY2VGdW5jPih3cml0ZVJlYWR5 Q2FsbGJhY2spLCB0aGlzLCAwKTsKKyAgICBnX3NvdXJjZV9zZXRfY2FsbGJhY2sobV93cml0ZVJl YWR5U291cmNlLmdldCgpLCByZWludGVycHJldF9jYXN0PEdTb3VyY2VGdW5jPih3cml0ZVJlYWR5 Q2FsbGJhY2spLCBtX2lkLCAwKTsKICAgICBnX3NvdXJjZV9hdHRhY2gobV93cml0ZVJlYWR5U291 cmNlLmdldCgpLCAwKTsKIH0KIApAQCAtMjI4LDE0ICsyMzcsMTUgQEAgdm9pZCBTb2NrZXRTdHJl YW1IYW5kbGU6OnN0b3BXYWl0aW5nRm9yU29ja2V0V3JpdGFiaWxpdHkoKQogICAgIG1fd3JpdGVS ZWFkeVNvdXJjZSA9IDA7CiB9CiAKLXN0YXRpYyB2b2lkIGNvbm5lY3RlZENhbGxiYWNrKEdTb2Nr ZXRDbGllbnQqIGNsaWVudCwgR0FzeW5jUmVzdWx0KiByZXN1bHQsIFNvY2tldFN0cmVhbUhhbmRs ZSogaGFuZGxlKQorc3RhdGljIHZvaWQgY29ubmVjdGVkQ2FsbGJhY2soR1NvY2tldENsaWVudCog Y2xpZW50LCBHQXN5bmNSZXN1bHQqIHJlc3VsdCwgdm9pZCogaWQpCiB7CiAgICAgLy8gQWx3YXlz IGZpbmlzaCB0aGUgY29ubmVjdGlvbiwgZXZlbiBpZiB0aGlzIFNvY2tldFN0cmVhbUhhbmRsZSB3 YXMgZGVhY3RpdmF0ZWQgZWFybGllci4KICAgICBHT3duUHRyPEdFcnJvcj4gZXJyb3I7CiAgICAg R1NvY2tldENvbm5lY3Rpb24qIHNvY2tldENvbm5lY3Rpb24gPSBnX3NvY2tldF9jbGllbnRfY29u bmVjdF90b19ob3N0X2ZpbmlzaChjbGllbnQsIHJlc3VsdCwgJmVycm9yLm91dFB0cigpKTsKIAog ICAgIC8vIFRoZSBTb2NrZXRTdHJlYW1IYW5kbGUgaGFzIGJlZW4gZGVhY3RpdmF0ZWQsIHNvIGp1 c3QgY2xvc2UgdGhlIGNvbm5lY3Rpb24sIGlnbm9yaW5nIGVycm9ycy4KLSAgICBpZiAoIWlzQWN0 aXZlSGFuZGxlKGhhbmRsZSkpIHsKKyAgICBTb2NrZXRTdHJlYW1IYW5kbGUqIGhhbmRsZSA9IGdl dEhhbmRsZUZyb21JZChpZCk7CisgICAgaWYgKCFoYW5kbGUpIHsKICAgICAgICAgZ19pb19zdHJl YW1fY2xvc2UoR19JT19TVFJFQU0oc29ja2V0Q29ubmVjdGlvbiksIDAsICZlcnJvci5vdXRQdHIo KSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0yNDMsMjAgKzI1MywyMyBAQCBzdGF0aWMg dm9pZCBjb25uZWN0ZWRDYWxsYmFjayhHU29ja2V0Q2xpZW50KiBjbGllbnQsIEdBc3luY1Jlc3Vs dCogcmVzdWx0LCBTb2NrZQogICAgIGhhbmRsZS0+Y29ubmVjdGVkKHNvY2tldENvbm5lY3Rpb24s IGVycm9yLmdldCgpKTsKIH0KIAotc3RhdGljIHZvaWQgcmVhZFJlYWR5Q2FsbGJhY2soR0lucHV0 U3RyZWFtKiBzdHJlYW0sIEdBc3luY1Jlc3VsdCogcmVzdWx0LCBTb2NrZXRTdHJlYW1IYW5kbGUq IGhhbmRsZSkKK3N0YXRpYyB2b2lkIHJlYWRSZWFkeUNhbGxiYWNrKEdJbnB1dFN0cmVhbSogc3Ry ZWFtLCBHQXN5bmNSZXN1bHQqIHJlc3VsdCwgdm9pZCogaWQpCiB7CiAgICAgLy8gQWx3YXlzIGZp bmlzaCB0aGUgcmVhZCwgZXZlbiBpZiB0aGlzIFNvY2tldFN0cmVhbUhhbmRsZSB3YXMgZGVhY3Rp dmF0ZWQgZWFybGllci4KICAgICBHT3duUHRyPEdFcnJvcj4gZXJyb3I7CiAgICAgZ3NzaXplIGJ5 dGVzUmVhZCA9IGdfaW5wdXRfc3RyZWFtX3JlYWRfZmluaXNoKHN0cmVhbSwgcmVzdWx0LCAmZXJy b3Iub3V0UHRyKCkpOwogCi0gICAgaWYgKCFpc0FjdGl2ZUhhbmRsZShoYW5kbGUpKQorICAgIFNv Y2tldFN0cmVhbUhhbmRsZSogaGFuZGxlID0gZ2V0SGFuZGxlRnJvbUlkKGlkKTsKKyAgICBpZiAo IWhhbmRsZSkKICAgICAgICAgcmV0dXJuOworCiAgICAgaGFuZGxlLT5yZWFkQnl0ZXMoYnl0ZXNS ZWFkLCBlcnJvci5nZXQoKSk7CiB9CiAKLXN0YXRpYyBnYm9vbGVhbiB3cml0ZVJlYWR5Q2FsbGJh Y2soR1NvY2tldCosIEdJT0NvbmRpdGlvbiBjb25kaXRpb24sIFNvY2tldFN0cmVhbUhhbmRsZSog aGFuZGxlKQorc3RhdGljIGdib29sZWFuIHdyaXRlUmVhZHlDYWxsYmFjayhHU29ja2V0KiwgR0lP Q29uZGl0aW9uIGNvbmRpdGlvbiwgdm9pZCogaWQpCiB7Ci0gICAgaWYgKCFpc0FjdGl2ZUhhbmRs ZShoYW5kbGUpKQorICAgIFNvY2tldFN0cmVhbUhhbmRsZSogaGFuZGxlID0gZ2V0SGFuZGxlRnJv bUlkKGlkKTsKKyAgICBpZiAoIWhhbmRsZSkKICAgICAgICAgcmV0dXJuIEZBTFNFOwogCiAgICAg Ly8gR19JT19IVVAgYW5kIEdfSU9fRVJSIGFyZSBhcmUgYWx3YXlzIGFjdGl2ZS4gU2VlOgo=