79298 2012-02-22 16:19:04 -0800 [WebSocket] Remove zlib.h from WebSocketDeflater.h 2012-02-22 19:44:39 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bashi bashi tkent toyoshim webkit.review.bot yutak oldest_to_newest 562517 0 bashi 2012-02-22 16:19:04 -0800 Including zlib.h in header files introduced a bunch of zlib dependency and caused build failure unexpectedly (http://build.chromium.org/p/chromium.webkit/builders/Webkit%20Win%20Builder/builds/20781). We should put zlib.h in .cpp files rather than .h files. 562526 1 128326 bashi 2012-02-22 16:27:03 -0800 Created attachment 128326 Patch 562528 2 bashi 2012-02-22 16:29:01 -0800 Hi Kent-san, Could you take a look? This change is needed to avoid adding a bunch of zlib dependency to GYP files. 562594 3 128326 tkent 2012-02-22 17:12:44 -0800 Comment on attachment 128326 Patch Looks ok. 562597 4 128326 bashi 2012-02-22 17:14:37 -0800 Comment on attachment 128326 Patch Thank you! 562723 5 128326 webkit.review.bot 2012-02-22 19:44:34 -0800 Comment on attachment 128326 Patch Clearing flags on attachment: 128326 Committed r108600: <http://trac.webkit.org/changeset/108600> 562724 6 webkit.review.bot 2012-02-22 19:44:39 -0800 All reviewed patches have been landed. Closing bug. 128326 2012-02-22 16:27:03 -0800 2012-02-22 19:44:34 -0800 Patch bug-79298-20120223092701.patch text/plain 9363 bashi U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4NTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzU3ODQxYWU2NzliODgy YTUwODBkYjFkZmZmMzJmMDc4ODI5MTgzMi4uMDhiOTQ2ODMzMWU1OGE4MTYyNzVmZTg4MjZjM2Ex ZDkwY2EwODdiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTAyLTIyICBLZW5p Y2hpIElzaGliYXNoaSAgPGJhc2hpQGNocm9taXVtLm9yZz4KKworICAgICAgICBbV2ViU29ja2V0 XSBSZW1vdmUgemxpYi5oIGZyb20gV2ViU29ja2V0RGVmbGF0ZXIuaAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzkyOTgKKworICAgICAgICBVc2UgZm9y d2FyZCBkZWNsYXJhdGlvbiBhbmQgT3duUHRyIGZvciB6X3N0cmVhbSB0byBtb3ZlIHpsaWIuaCBm cm9tCisgICAgICAgIC5oIGZpbGUgdG8gLmNwcCBmaWxlLgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gTm8gYmVoYXZpb3IgY2hh bmdlLgorCisgICAgICAgICogd2Vic29ja2V0cy9XZWJTb2NrZXREZWZsYXRlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpXZWJTb2NrZXREZWZsYXRlcjo6V2ViU29ja2V0RGVmbGF0ZXIpOgorICAg ICAgICAoV2ViQ29yZTo6V2ViU29ja2V0RGVmbGF0ZXI6OmluaXRpYWxpemUpOgorICAgICAgICAo V2ViQ29yZTo6V2ViU29ja2V0RGVmbGF0ZXI6On5XZWJTb2NrZXREZWZsYXRlcik6CisgICAgICAg IChXZWJDb3JlOjpzZXRTdHJlYW1QYXJhbWV0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6V2ViU29j a2V0RGVmbGF0ZXI6OmFkZEJ5dGVzKToKKyAgICAgICAgKFdlYkNvcmU6OldlYlNvY2tldERlZmxh dGVyOjpmaW5pc2gpOgorICAgICAgICAoV2ViQ29yZTo6V2ViU29ja2V0RGVmbGF0ZXI6OnJlc2V0 KToKKyAgICAgICAgKFdlYkNvcmU6OldlYlNvY2tldEluZmxhdGVyOjpXZWJTb2NrZXRJbmZsYXRl cik6CisgICAgICAgIChXZWJDb3JlOjpXZWJTb2NrZXRJbmZsYXRlcjo6aW5pdGlhbGl6ZSk6Cisg ICAgICAgIChXZWJDb3JlOjpXZWJTb2NrZXRJbmZsYXRlcjo6fldlYlNvY2tldEluZmxhdGVyKToK KyAgICAgICAgKFdlYkNvcmU6OldlYlNvY2tldEluZmxhdGVyOjphZGRCeXRlcyk6CisgICAgICAg IChXZWJDb3JlOjpXZWJTb2NrZXRJbmZsYXRlcjo6ZmluaXNoKToKKyAgICAgICAgKiB3ZWJzb2Nr ZXRzL1dlYlNvY2tldERlZmxhdGVyLmg6CisgICAgICAgIChXZWJTb2NrZXREZWZsYXRlcik6IFVz ZSBPd25QdHIgZm9yIG1fc3RyZWFtLgorICAgICAgICAoV2ViU29ja2V0SW5mbGF0ZXIpOiBEaXR0 by4KKwogMjAxMi0wMi0yMiAgTWF4IFZ1am92aWMgIDxtdnVqb3ZpY0BhZG9iZS5jb20+CiAKICAg ICAgICAgUGFkZGluZ3MgYW5kIGJvcmRlcnMgb24gcm9vdCBTVkcgZWxlbWVudCB3aXRoIHZpZXdi b3ggY2F1c2VzIGNoaWxkIFNWRyBlbGVtZW50cyB0byBiZSByZW5kZXJlZCB3aXRoIHRoZSBpbmNv cnJlY3Qgc2l6ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2Nr ZXREZWZsYXRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldERlZmxh dGVyLmNwcAppbmRleCAwYjg2OGY0Nzc2ZmEzNTcwZDc1ODc3MzliZGFkOTI2OWUzMzY0MzcyLi40 N2VhOTQwNTViMTMwYzk2MGE1Mjg3ZmFlNzczNDA2OTczYTdiY2IzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldERlZmxhdGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldERlZmxhdGVyLmNwcApAQCAtNDEsNiArNDEsNyBA QAogI2luY2x1ZGUgPHd0Zi9TdHJpbmdFeHRyYXMuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJp bmdIYXNoLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CisjaW5jbHVkZSA8emxp Yi5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTU4LDI3ICs1OSwyOCBAQCBXZWJTb2Nr ZXREZWZsYXRlcjo6V2ViU29ja2V0RGVmbGF0ZXIoaW50IHdpbmRvd0JpdHMsIENvbnRleHRUYWtl T3Zlck1vZGUgY29udGV4dAogewogICAgIEFTU0VSVChtX3dpbmRvd0JpdHMgPj0gOCk7CiAgICAg QVNTRVJUKG1fd2luZG93Qml0cyA8PSAxNSk7Ci0gICAgbWVtc2V0KCZtX3N0cmVhbSwgMCwgc2l6 ZW9mKHpfc3RyZWFtKSk7CisgICAgbV9zdHJlYW0gPSBhZG9wdFB0cihuZXcgel9zdHJlYW0pOwor ICAgIG1lbXNldChtX3N0cmVhbS5nZXQoKSwgMCwgc2l6ZW9mKHpfc3RyZWFtKSk7CiB9CiAKIGJv b2wgV2ViU29ja2V0RGVmbGF0ZXI6OmluaXRpYWxpemUoKQogewotICAgIHJldHVybiBkZWZsYXRl SW5pdDIoJm1fc3RyZWFtLCBaX0RFRkFVTFRfQ09NUFJFU1NJT04sIFpfREVGTEFURUQsIC1tX3dp bmRvd0JpdHMsIGRlZmF1bHRNZW1MZXZlbCwgWl9ERUZBVUxUX1NUUkFURUdZKSA9PSBaX09LOwor ICAgIHJldHVybiBkZWZsYXRlSW5pdDIobV9zdHJlYW0uZ2V0KCksIFpfREVGQVVMVF9DT01QUkVT U0lPTiwgWl9ERUZMQVRFRCwgLW1fd2luZG93Qml0cywgZGVmYXVsdE1lbUxldmVsLCBaX0RFRkFV TFRfU1RSQVRFR1kpID09IFpfT0s7CiB9CiAKIFdlYlNvY2tldERlZmxhdGVyOjp+V2ViU29ja2V0 RGVmbGF0ZXIoKQogewotICAgIGludCByZXN1bHQgPSBkZWZsYXRlRW5kKCZtX3N0cmVhbSk7Cisg ICAgaW50IHJlc3VsdCA9IGRlZmxhdGVFbmQobV9zdHJlYW0uZ2V0KCkpOwogICAgIGlmIChyZXN1 bHQgIT0gWl9PSykKICAgICAgICAgTE9HKE5ldHdvcmssICJkZWZsYXRlRW5kKCkgZmFpbGVkOiAl ZCIsIHJlc3VsdCk7CiB9CiAKLXN0YXRpYyB2b2lkIHNldFN0cmVhbVBhcmFtZXRlcih6X3N0cmVh bSYgc3RyZWFtLCBjb25zdCBjaGFyKiBpbnB1dERhdGEsIHNpemVfdCBpbnB1dExlbmd0aCwgY2hh ciogb3V0cHV0RGF0YSwgc2l6ZV90IG91dHB1dExlbmd0aCkKK3N0YXRpYyB2b2lkIHNldFN0cmVh bVBhcmFtZXRlcih6X3N0cmVhbSogc3RyZWFtLCBjb25zdCBjaGFyKiBpbnB1dERhdGEsIHNpemVf dCBpbnB1dExlbmd0aCwgY2hhciogb3V0cHV0RGF0YSwgc2l6ZV90IG91dHB1dExlbmd0aCkKIHsK LSAgICBzdHJlYW0ubmV4dF9pbiA9IHJlaW50ZXJwcmV0X2Nhc3Q8Qnl0ZWYqPihjb25zdF9jYXN0 PGNoYXIqPihpbnB1dERhdGEpKTsKLSAgICBzdHJlYW0uYXZhaWxfaW4gPSBpbnB1dExlbmd0aDsK LSAgICBzdHJlYW0ubmV4dF9vdXQgPSByZWludGVycHJldF9jYXN0PEJ5dGVmKj4ob3V0cHV0RGF0 YSk7Ci0gICAgc3RyZWFtLmF2YWlsX291dCA9IG91dHB1dExlbmd0aDsKKyAgICBzdHJlYW0tPm5l eHRfaW4gPSByZWludGVycHJldF9jYXN0PEJ5dGVmKj4oY29uc3RfY2FzdDxjaGFyKj4oaW5wdXRE YXRhKSk7CisgICAgc3RyZWFtLT5hdmFpbF9pbiA9IGlucHV0TGVuZ3RoOworICAgIHN0cmVhbS0+ bmV4dF9vdXQgPSByZWludGVycHJldF9jYXN0PEJ5dGVmKj4ob3V0cHV0RGF0YSk7CisgICAgc3Ry ZWFtLT5hdmFpbF9vdXQgPSBvdXRwdXRMZW5ndGg7CiB9CiAKIGJvb2wgV2ViU29ja2V0RGVmbGF0 ZXI6OmFkZEJ5dGVzKGNvbnN0IGNoYXIqIGRhdGEsIHNpemVfdCBsZW5ndGgpCkBAIC04NiwxNSAr ODgsMTUgQEAgYm9vbCBXZWJTb2NrZXREZWZsYXRlcjo6YWRkQnl0ZXMoY29uc3QgY2hhciogZGF0 YSwgc2l6ZV90IGxlbmd0aCkKICAgICBpZiAoIWxlbmd0aCkKICAgICAgICAgcmV0dXJuIGZhbHNl OwogCi0gICAgc2l6ZV90IG1heExlbmd0aCA9IGRlZmxhdGVCb3VuZCgmbV9zdHJlYW0sIGxlbmd0 aCk7CisgICAgc2l6ZV90IG1heExlbmd0aCA9IGRlZmxhdGVCb3VuZChtX3N0cmVhbS5nZXQoKSwg bGVuZ3RoKTsKICAgICBzaXplX3Qgd3JpdGVQb3NpdGlvbiA9IG1fYnVmZmVyLnNpemUoKTsKICAg ICBtX2J1ZmZlci5ncm93KHdyaXRlUG9zaXRpb24gKyBtYXhMZW5ndGgpOwotICAgIHNldFN0cmVh bVBhcmFtZXRlcihtX3N0cmVhbSwgZGF0YSwgbGVuZ3RoLCBtX2J1ZmZlci5kYXRhKCkgKyB3cml0 ZVBvc2l0aW9uLCBtYXhMZW5ndGgpOwotICAgIGludCByZXN1bHQgPSBkZWZsYXRlKCZtX3N0cmVh bSwgWl9OT19GTFVTSCk7Ci0gICAgaWYgKHJlc3VsdCAhPSBaX09LIHx8IG1fc3RyZWFtLmF2YWls X2luID4gMCkKKyAgICBzZXRTdHJlYW1QYXJhbWV0ZXIobV9zdHJlYW0uZ2V0KCksIGRhdGEsIGxl bmd0aCwgbV9idWZmZXIuZGF0YSgpICsgd3JpdGVQb3NpdGlvbiwgbWF4TGVuZ3RoKTsKKyAgICBp bnQgcmVzdWx0ID0gZGVmbGF0ZShtX3N0cmVhbS5nZXQoKSwgWl9OT19GTFVTSCk7CisgICAgaWYg KHJlc3VsdCAhPSBaX09LIHx8IG1fc3RyZWFtLT5hdmFpbF9pbiA+IDApCiAgICAgICAgIHJldHVy biBmYWxzZTsKIAotICAgIG1fYnVmZmVyLnNocmluayh3cml0ZVBvc2l0aW9uICsgbWF4TGVuZ3Ro IC0gbV9zdHJlYW0uYXZhaWxfb3V0KTsKKyAgICBtX2J1ZmZlci5zaHJpbmsod3JpdGVQb3NpdGlv biArIG1heExlbmd0aCAtIG1fc3RyZWFtLT5hdmFpbF9vdXQpOwogICAgIHJldHVybiB0cnVlOwog fQogCkBAIC0xMDQsOSArMTA2LDkgQEAgYm9vbCBXZWJTb2NrZXREZWZsYXRlcjo6ZmluaXNoKCkK ICAgICAgICAgc2l6ZV90IHdyaXRlUG9zaXRpb24gPSBtX2J1ZmZlci5zaXplKCk7CiAgICAgICAg IG1fYnVmZmVyLmdyb3cod3JpdGVQb3NpdGlvbiArIGJ1ZmZlckluY3JlbWVudFVuaXQpOwogICAg ICAgICBzaXplX3QgYXZhaWxhYmxlQ2FwYWNpdHkgPSBtX2J1ZmZlci5zaXplKCkgLSB3cml0ZVBv c2l0aW9uOwotICAgICAgICBzZXRTdHJlYW1QYXJhbWV0ZXIobV9zdHJlYW0sIDAsIDAsIG1fYnVm ZmVyLmRhdGEoKSArIHdyaXRlUG9zaXRpb24sIGF2YWlsYWJsZUNhcGFjaXR5KTsKLSAgICAgICAg aW50IHJlc3VsdCA9IGRlZmxhdGUoJm1fc3RyZWFtLCBaX1NZTkNfRkxVU0gpOwotICAgICAgICBt X2J1ZmZlci5zaHJpbmsod3JpdGVQb3NpdGlvbiArIGF2YWlsYWJsZUNhcGFjaXR5IC0gbV9zdHJl YW0uYXZhaWxfb3V0KTsKKyAgICAgICAgc2V0U3RyZWFtUGFyYW1ldGVyKG1fc3RyZWFtLmdldCgp LCAwLCAwLCBtX2J1ZmZlci5kYXRhKCkgKyB3cml0ZVBvc2l0aW9uLCBhdmFpbGFibGVDYXBhY2l0 eSk7CisgICAgICAgIGludCByZXN1bHQgPSBkZWZsYXRlKG1fc3RyZWFtLmdldCgpLCBaX1NZTkNf RkxVU0gpOworICAgICAgICBtX2J1ZmZlci5zaHJpbmsod3JpdGVQb3NpdGlvbiArIGF2YWlsYWJs ZUNhcGFjaXR5IC0gbV9zdHJlYW0tPmF2YWlsX291dCk7CiAgICAgICAgIGlmIChyZXN1bHQgPT0g Wl9PSykKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBpZiAocmVzdWx0ICE9IFpfQlVGX0VS Uk9SKQpAQCAtMTIzLDcgKzEyNSw3IEBAIHZvaWQgV2ViU29ja2V0RGVmbGF0ZXI6OnJlc2V0KCkK IHsKICAgICBtX2J1ZmZlci5jbGVhcigpOwogICAgIGlmIChtX2NvbnRleHRUYWtlT3Zlck1vZGUg PT0gRG9Ob3RUYWtlT3ZlckNvbnRleHQpCi0gICAgICAgIGRlZmxhdGVSZXNldCgmbV9zdHJlYW0p OworICAgICAgICBkZWZsYXRlUmVzZXQobV9zdHJlYW0uZ2V0KCkpOwogfQogCiBQYXNzT3duUHRy PFdlYlNvY2tldEluZmxhdGVyPiBXZWJTb2NrZXRJbmZsYXRlcjo6Y3JlYXRlKGludCB3aW5kb3dC aXRzKQpAQCAtMTM0LDE3ICsxMzYsMTggQEAgUGFzc093blB0cjxXZWJTb2NrZXRJbmZsYXRlcj4g V2ViU29ja2V0SW5mbGF0ZXI6OmNyZWF0ZShpbnQgd2luZG93Qml0cykKIFdlYlNvY2tldEluZmxh dGVyOjpXZWJTb2NrZXRJbmZsYXRlcihpbnQgd2luZG93Qml0cykKICAgICA6IG1fd2luZG93Qml0 cyh3aW5kb3dCaXRzKQogewotICAgIG1lbXNldCgmbV9zdHJlYW0sIDAsIHNpemVvZih6X3N0cmVh bSkpOworICAgIG1fc3RyZWFtID0gYWRvcHRQdHIobmV3IHpfc3RyZWFtKTsKKyAgICBtZW1zZXQo bV9zdHJlYW0uZ2V0KCksIDAsIHNpemVvZih6X3N0cmVhbSkpOwogfQogCiBib29sIFdlYlNvY2tl dEluZmxhdGVyOjppbml0aWFsaXplKCkKIHsKLSAgICByZXR1cm4gaW5mbGF0ZUluaXQyKCZtX3N0 cmVhbSwgLW1fd2luZG93Qml0cykgPT0gWl9PSzsKKyAgICByZXR1cm4gaW5mbGF0ZUluaXQyKG1f c3RyZWFtLmdldCgpLCAtbV93aW5kb3dCaXRzKSA9PSBaX09LOwogfQogCiBXZWJTb2NrZXRJbmZs YXRlcjo6fldlYlNvY2tldEluZmxhdGVyKCkKIHsKLSAgICBpbnQgcmVzdWx0ID0gaW5mbGF0ZUVu ZCgmbV9zdHJlYW0pOworICAgIGludCByZXN1bHQgPSBpbmZsYXRlRW5kKG1fc3RyZWFtLmdldCgp KTsKICAgICBpZiAocmVzdWx0ICE9IFpfT0spCiAgICAgICAgIExPRyhOZXR3b3JrLCAiaW5mbGF0 ZUVuZCgpIGZhaWxlZDogJWQiLCByZXN1bHQpOwogfQpAQCAtMTYwLDEwICsxNjMsMTAgQEAgYm9v bCBXZWJTb2NrZXRJbmZsYXRlcjo6YWRkQnl0ZXMoY29uc3QgY2hhciogZGF0YSwgc2l6ZV90IGxl bmd0aCkKICAgICAgICAgbV9idWZmZXIuZ3Jvdyh3cml0ZVBvc2l0aW9uICsgYnVmZmVySW5jcmVt ZW50VW5pdCk7CiAgICAgICAgIHNpemVfdCBhdmFpbGFibGVDYXBhY2l0eSA9IG1fYnVmZmVyLnNp emUoKSAtIHdyaXRlUG9zaXRpb247CiAgICAgICAgIHNpemVfdCByZW1haW5pbmdMZW5ndGggPSBs ZW5ndGggLSBjb25zdW1lZFNvRmFyOwotICAgICAgICBzZXRTdHJlYW1QYXJhbWV0ZXIobV9zdHJl YW0sIGRhdGEgKyBjb25zdW1lZFNvRmFyLCByZW1haW5pbmdMZW5ndGgsIG1fYnVmZmVyLmRhdGEo KSArIHdyaXRlUG9zaXRpb24sIGF2YWlsYWJsZUNhcGFjaXR5KTsKLSAgICAgICAgaW50IHJlc3Vs dCA9IGluZmxhdGUoJm1fc3RyZWFtLCBaX05PX0ZMVVNIKTsKLSAgICAgICAgY29uc3VtZWRTb0Zh ciArPSByZW1haW5pbmdMZW5ndGggLSBtX3N0cmVhbS5hdmFpbF9pbjsKLSAgICAgICAgbV9idWZm ZXIuc2hyaW5rKHdyaXRlUG9zaXRpb24gKyBhdmFpbGFibGVDYXBhY2l0eSAtIG1fc3RyZWFtLmF2 YWlsX291dCk7CisgICAgICAgIHNldFN0cmVhbVBhcmFtZXRlcihtX3N0cmVhbS5nZXQoKSwgZGF0 YSArIGNvbnN1bWVkU29GYXIsIHJlbWFpbmluZ0xlbmd0aCwgbV9idWZmZXIuZGF0YSgpICsgd3Jp dGVQb3NpdGlvbiwgYXZhaWxhYmxlQ2FwYWNpdHkpOworICAgICAgICBpbnQgcmVzdWx0ID0gaW5m bGF0ZShtX3N0cmVhbS5nZXQoKSwgWl9OT19GTFVTSCk7CisgICAgICAgIGNvbnN1bWVkU29GYXIg Kz0gcmVtYWluaW5nTGVuZ3RoIC0gbV9zdHJlYW0tPmF2YWlsX2luOworICAgICAgICBtX2J1ZmZl ci5zaHJpbmsod3JpdGVQb3NpdGlvbiArIGF2YWlsYWJsZUNhcGFjaXR5IC0gbV9zdHJlYW0tPmF2 YWlsX291dCk7CiAgICAgICAgIGlmIChyZXN1bHQgPT0gWl9CVUZfRVJST1IpCiAgICAgICAgICAg ICBjb250aW51ZTsKICAgICAgICAgaWYgKHJlc3VsdCAhPSBaX09LKQpAQCAtMTg1LDEwICsxODgs MTAgQEAgYm9vbCBXZWJTb2NrZXRJbmZsYXRlcjo6ZmluaXNoKCkKICAgICAgICAgbV9idWZmZXIu Z3Jvdyh3cml0ZVBvc2l0aW9uICsgYnVmZmVySW5jcmVtZW50VW5pdCk7CiAgICAgICAgIHNpemVf dCBhdmFpbGFibGVDYXBhY2l0eSA9IG1fYnVmZmVyLnNpemUoKSAtIHdyaXRlUG9zaXRpb247CiAg ICAgICAgIHNpemVfdCByZW1haW5pbmdMZW5ndGggPSBzdHJpcHBlZExlbmd0aCAtIGNvbnN1bWVk U29GYXI7Ci0gICAgICAgIHNldFN0cmVhbVBhcmFtZXRlcihtX3N0cmVhbSwgc3RyaXBwZWRGaWVs ZHMgKyBjb25zdW1lZFNvRmFyLCByZW1haW5pbmdMZW5ndGgsIG1fYnVmZmVyLmRhdGEoKSArIHdy aXRlUG9zaXRpb24sIGF2YWlsYWJsZUNhcGFjaXR5KTsKLSAgICAgICAgaW50IHJlc3VsdCA9IGlu ZmxhdGUoJm1fc3RyZWFtLCBaX0ZJTklTSCk7Ci0gICAgICAgIGNvbnN1bWVkU29GYXIgKz0gcmVt YWluaW5nTGVuZ3RoIC0gbV9zdHJlYW0uYXZhaWxfaW47Ci0gICAgICAgIG1fYnVmZmVyLnNocmlu ayh3cml0ZVBvc2l0aW9uICsgYXZhaWxhYmxlQ2FwYWNpdHkgLSBtX3N0cmVhbS5hdmFpbF9vdXQp OworICAgICAgICBzZXRTdHJlYW1QYXJhbWV0ZXIobV9zdHJlYW0uZ2V0KCksIHN0cmlwcGVkRmll bGRzICsgY29uc3VtZWRTb0ZhciwgcmVtYWluaW5nTGVuZ3RoLCBtX2J1ZmZlci5kYXRhKCkgKyB3 cml0ZVBvc2l0aW9uLCBhdmFpbGFibGVDYXBhY2l0eSk7CisgICAgICAgIGludCByZXN1bHQgPSBp bmZsYXRlKG1fc3RyZWFtLmdldCgpLCBaX0ZJTklTSCk7CisgICAgICAgIGNvbnN1bWVkU29GYXIg Kz0gcmVtYWluaW5nTGVuZ3RoIC0gbV9zdHJlYW0tPmF2YWlsX2luOworICAgICAgICBtX2J1ZmZl ci5zaHJpbmsod3JpdGVQb3NpdGlvbiArIGF2YWlsYWJsZUNhcGFjaXR5IC0gbV9zdHJlYW0tPmF2 YWlsX291dCk7CiAgICAgICAgIGlmIChyZXN1bHQgPT0gWl9CVUZfRVJST1IpCiAgICAgICAgICAg ICBjb250aW51ZTsKICAgICAgICAgaWYgKHJlc3VsdCAhPSBaX09LICYmIHJlc3VsdCAhPSBaX1NU UkVBTV9FTkQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tl dERlZmxhdGVyLmggYi9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldERlZmxhdGVy LmgKaW5kZXggMjg1MzQ1MTQxNzAxMTc5NjM4MzVmZWIwNzM2Yzg5ZTkwZWM0ZjJlYi4uOWM2MzBk Y2ZiNmNmN2QyNmZjNmMxMDRmYTJiZmFmZDAzODg4OGFjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXREZWZsYXRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3dlYnNvY2tldHMvV2ViU29ja2V0RGVmbGF0ZXIuaApAQCAtMzcsNyArMzcsOSBAQAogI2luY2x1 ZGUgPHd0Zi9Pd25QdHIuaD4KICNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgogI2luY2x1ZGUg PHd0Zi9WZWN0b3IuaD4KLSNpbmNsdWRlIDx6bGliLmg+CisKK3N0cnVjdCB6X3N0cmVhbV9zOwor dHlwZWRlZiB6X3N0cmVhbV9zIHpfc3RyZWFtOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAg LTY0LDcgKzY2LDcgQEAgcHJpdmF0ZToKICAgICBpbnQgbV93aW5kb3dCaXRzOwogICAgIENvbnRl eHRUYWtlT3Zlck1vZGUgbV9jb250ZXh0VGFrZU92ZXJNb2RlOwogICAgIFZlY3RvcjxjaGFyPiBt X2J1ZmZlcjsKLSAgICB6X3N0cmVhbSBtX3N0cmVhbTsKKyAgICBPd25QdHI8el9zdHJlYW0+IG1f c3RyZWFtOwogfTsKIAogY2xhc3MgV2ViU29ja2V0SW5mbGF0ZXIgewpAQCAtODUsNyArODcsNyBA QCBwcml2YXRlOgogCiAgICAgaW50IG1fd2luZG93Qml0czsKICAgICBWZWN0b3I8Y2hhcj4gbV9i dWZmZXI7Ci0gICAgel9zdHJlYW0gbV9zdHJlYW07CisgICAgT3duUHRyPHpfc3RyZWFtPiBtX3N0 cmVhbTsKIH07CiAKIH0K