222087 2021-02-17 18:39:05 -0800 Fix a few issues with RangeResponseGenerator 2021-02-18 09:45:20 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=221072 P2 Normal --- 1 achristensen achristensen jer.noble oldest_to_newest 1730703 0 achristensen 2021-02-17 18:39:05 -0800 Fix a few issues with RangeResponseGenerator 1730707 1 420782 achristensen 2021-02-17 18:54:46 -0800 Created attachment 420782 Patch 1730726 2 achristensen 2021-02-17 20:34:06 -0800 r273061 420782 2021-02-17 18:54:46 -0800 2021-02-17 19:16:14 -0800 Patch bug-222087-20210217185445.patch text/plain 12392 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMDMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDYwMTY1ZTc0MGQyMzVh ZGM1NGE0MWFkOTEyM2YxNjFiZDNlZWMwMi4uYmNkZDIyM2EyNGRkY2M5YmRkYzdmYWE1ZDkyMmVl YmZkOGJjMDBjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDIxLTAyLTE3ICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IGEg ZmV3IGlzc3VlcyB3aXRoIFJhbmdlUmVzcG9uc2VHZW5lcmF0b3IKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjA4NworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gaXQgd2FzIGVuYWJsZWQgZnJvbSBy MjcyOTA4IHRvIHIyNzMwMzMgc2VydmVyYWwgaXNzdWVzIHdlcmUgZm91bmQgYW5kIGl0IHdhcyBk aXNhYmxlZCB1bnRpbCBJIGZpeGVkIHRoZW0uCisKKyAgICAgICAgVGhlIGZpcnN0IHdhcyB0aGF0 IFJhbmdlUmVzcG9uc2VHZW5lcmF0b3Igd2FzIG93bmVkIGRpcmVjbHR5IGJ5IHRoZSBXZWJDb3Jl TlNVUkxTZXNzaW9uIHdoaWNoIGlzIG9mdGVuIGRlYWxsb2NhdGVkIG9uIGEgbm9uLW1haW4gdGhy ZWFkLAorICAgICAgICB3aGljaCBjYXVzZWQgYWxsIGtpbmRzIG9mIHByb2JsZW1zIHdpdGggdGhl IFN0cmluZ3MgYW5kIEF0b21TdHJpbmdzIHRoYXQgYXJlIG93bmVkIGJ5IGl0cyBzdHJ1Y3R1cmVz LgorICAgICAgICBUaGlzIHdhcyBmaXhlZCBieSB1c2luZyBXVEY6OkRlc3RydWN0aW9uVGhyZWFk OjpNYWluIGFuZCBJIGFkZGVkIGFzc2VydGlvbnMgaW4gdGhlIGNvbnN0cnVjdG9yIGFuZCBkZXN0 cnVjdG9yLgorCisgICAgICAgIFRoZSBzZWNvbmQgd2FzIHRoYXQgV2ViQ29yZU5TVVJMU2Vzc2lv bkRhdGFUYXNrJ3MgZGVhbGxvYyBpcyBjYXN0aW5nIF9yZXNvdXJjZS0+Y2xpZW50KCkgdG8gYSBX ZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2tDbGllbnQqIGFuZCBjYWxsaW5nIGNsZWFyVGFzayBv biBpdCwKKyAgICAgICAgd2hpY2ggd3JpdGVzIG51bGwgdG8gdGhhdCBtZW1vcnkuICBCZWZvcmUg cjI3MjkwOCBpdCB3YXMgYSBnb29kIGFzc3VtcHRpb24gdGhhdCB0aGUgY2xpZW50IHdhcyBhbHdh eXMgYSBXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2tDbGllbnQsIHNvIHRoZXJlIHdhcyBubyBw cm9ibGVtLgorICAgICAgICBTaW5jZSB0aGVuLCB0aG91Z2gsIGl0IGNvdWxkIGJlIGEgTWVkaWFS ZXNvdXJjZUNsaWVudC4gIFRoZSBmcnVzdHJhdGluZyB0aGluZyBpcyB0aGF0IHRob3NlIHR3byBj bGllbnRzIGhhdmUgdGhlIHNhbWUgc2l6ZSAoMzIgYnl0ZXMpIHNvIHRoZXJlIHdhcyBubyBvdXQt b2YtYm91bmRzCisgICAgICAgIG1lbW9yeSB3cml0ZXMsIHNvIEFTQU4gd2Fzbid0IHNlZWluZyBh bnl0aGluZyB3cm9uZy4gIEkgd2FzIGp1c3Qgc2VlaW5nIDAncyB3cml0dGVuIHJhbmRvbWx5IHRv IG15IGNsaWVudCdzIGRhdGEuICBJIHNvbHZlZCB0aGlzIGJ5IHNldHRpbmcgX3Jlc291cmNlIHRv IG51bGwgd2hlbgorICAgICAgICB0aGUgUmFuZ2VSZXNwb25zZUdlbmVyYXRvciBhZG9wdHMgdGhl IHJlc291cmNlIGFuZCBjbGllbnQsIHNvIFdlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzaydzIGRl YWxsb2Mgd29uJ3QgZG8gYW55dGhpbmcgd2l0aCBpdCBhbnkgbW9yZS4KKworICAgICAgICBUaGUg dGhpcmQgd2FzIHRoYXQgd2hlbiB0aGUgbWVkaWEgc3RhY2sgY2FsbHMgV2ViQ29yZU5TVVJMU2Vz c2lvbkRhdGFUYXNrJ3MgY2FuY2VsLCB3ZSB3ZXJlIG5vdCByZW1vdmluZyB0aGUgdGFzayBmcm9t IHRoZSBSYW5nZVJlc3BvbnNlR2VuZXJhdG9yJ3Mgc3RydWN0dXJlcy4KKyAgICAgICAgSSBub3Rp Y2VkIHRoYXQgd2hlbiBsb29raW5nIGF0IGxvZ3MsIGFuZCBhZGRlZCBhIGNhbGwgdG8gcmVtb3Zl VGFzay4KKworICAgICAgICBCZWZvcmUgZml4aW5nIHRoZXNlIHRocmVlIHRoaW5ncywgYWJvdXQg Mi8zIG9mIHRoZSB0aW1lIEkgY291bGRuJ3Qgd2F0Y2ggYSByZWFsIHZpZGVvIG9uIHRoZSByZWFs IGludGVybmV0IHN1Y2Nlc3NmdWxseS4gIE5vdywgSSBjYW4gYWJvdXQgOTUlIG9mIHRoZSB0aW1l IHdpdGggbXkKKyAgICAgICAgdGVzdCB2aWRlbywgd2hpY2ggcmVzcG9uZHMgd2l0aCBhbiBIVFRQ IDUwMyBhYm91dCA1JSBvZiB0aGUgdGltZSwgYW5kIHRoZXJlJ3Mgbm90aGluZyBJIGNhbiBkbyBh Ym91dCB0aGF0LiAgVGhlcmUgd2VyZSBhbHNvIHNvbWUgZmxha3kgdGVzdHMgdGhhdCBleGVyY2lz ZWQgdGhlc2UgcGF0aHMsCisgICAgICAgIHdoaWNoIGhhdmUgcGFzc2VkIGZvciBtZSBsb2NhbGx5 IGFsbW9zdCAyMDAwIHRpbWVzIHdpdGhvdXQgYW55IGZhaWx1cmVzLgorCisgICAgICAgICogcGxh dGZvcm0vbmV0d29yay9jb2NvYS9SYW5nZVJlc3BvbnNlR2VuZXJhdG9yLmg6CisgICAgICAgIChX ZWJDb3JlOjpSYW5nZVJlc3BvbnNlR2VuZXJhdG9yOjpjcmVhdGUpOgorICAgICAgICAqIHBsYXRm b3JtL25ldHdvcmsvY29jb2EvUmFuZ2VSZXNwb25zZUdlbmVyYXRvci5tbToKKyAgICAgICAgKFdl YkNvcmU6OlJhbmdlUmVzcG9uc2VHZW5lcmF0b3I6OlJhbmdlUmVzcG9uc2VHZW5lcmF0b3IpOgor ICAgICAgICAoV2ViQ29yZTo6UmFuZ2VSZXNwb25zZUdlbmVyYXRvcjo6flJhbmdlUmVzcG9uc2VH ZW5lcmF0b3IpOgorICAgICAgICAoV2ViQ29yZTo6UmFuZ2VSZXNwb25zZUdlbmVyYXRvcjo6cmVt b3ZlVGFzayk6CisgICAgICAgIChXZWJDb3JlOjpSYW5nZVJlc3BvbnNlR2VuZXJhdG9yOjpnaXZl UmVzcG9uc2VUb1Rhc2tJZkJ5dGVzSW5SYW5nZVJlY2VpdmVkKToKKyAgICAgICAgKFdlYkNvcmU6 OlJhbmdlUmVzcG9uc2VHZW5lcmF0b3I6OndpbGxTeW50aGVzaXplUmFuZ2VSZXNwb25zZXMpOgor ICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5TVVJMU2Vzc2lvbi5oOgor ICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5TVVJMU2Vzc2lvbi5tbToK KyAgICAgICAgKC1bV2ViQ29yZU5TVVJMU2Vzc2lvbiBpbml0V2l0aFJlc291cmNlTG9hZGVyOmRl bGVnYXRlOmRlbGVnYXRlUXVldWU6XSk6CisgICAgICAgICgtW1dlYkNvcmVOU1VSTFNlc3Npb24g cmFuZ2VSZXNwb25zZUdlbmVyYXRvcl0pOgorICAgICAgICAoLVtXZWJDb3JlTlNVUkxTZXNzaW9u RGF0YVRhc2sgX2NhbmNlbF0pOgorICAgICAgICAoLVtXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRh c2sgcmVzb3VyY2U6cmVjZWl2ZWRSZXNwb25zZTpjb21wbGV0aW9uSGFuZGxlcjpdKToKKwogMjAy MS0wMi0xNyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAg ICAgICAgIEVmZmVjdGl2ZWx5IHJldmVydCByMjcyOTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1JhbmdlUmVzcG9uc2VHZW5lcmF0b3IuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvUmFuZ2VSZXNwb25zZUdlbmVyYXRv ci5oCmluZGV4IDFiZmZjNzkxMDBlMmFlNzdmMWY3Y2ZmZmQ3YWM5Y2NjMzQ0ZDEyODYuLjBkYjg3 NzRmODVhMzYzY2M1YTMyNWYyZjkzZWJiZGU3NWE4ZmM5MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvUmFuZ2VSZXNwb25zZUdlbmVyYXRvci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvUmFuZ2VSZXNwb25zZUdl bmVyYXRvci5oCkBAIC0yNSw2ICsyNSw3IEBACiAKICNwcmFnbWEgb25jZQogCisjaW5jbHVkZSA8 d3RmL1RocmVhZFNhZmVSZWZDb3VudGVkLmg+CiAjaW5jbHVkZSA8d3RmL1VSTEhhc2guaD4KICNp bmNsdWRlIDx3dGYvV2Vha1B0ci5oPgogCkBAIC0zNywyMSArMzgsMjMgQEAgc3RydWN0IFBhcnNl ZFJlcXVlc3RSYW5nZTsKIGNsYXNzIFBsYXRmb3JtTWVkaWFSZXNvdXJjZTsKIGNsYXNzIFJlc291 cmNlUmVzcG9uc2U7CiAKLWNsYXNzIFJhbmdlUmVzcG9uc2VHZW5lcmF0b3IgOiBwdWJsaWMgQ2Fu TWFrZVdlYWtQdHI8UmFuZ2VSZXNwb25zZUdlbmVyYXRvcj4geworY2xhc3MgUmFuZ2VSZXNwb25z ZUdlbmVyYXRvciA6IHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRlZDxSYW5nZVJlc3BvbnNlR2Vu ZXJhdG9yLCBXVEY6OkRlc3RydWN0aW9uVGhyZWFkOjpNYWluPiwgcHVibGljIENhbk1ha2VXZWFr UHRyPFJhbmdlUmVzcG9uc2VHZW5lcmF0b3I+IHsKIHB1YmxpYzoKLSAgICBSYW5nZVJlc3BvbnNl R2VuZXJhdG9yKCk7CisgICAgc3RhdGljIFJlZjxSYW5nZVJlc3BvbnNlR2VuZXJhdG9yPiBjcmVh dGUoKSB7IHJldHVybiBhZG9wdFJlZigqbmV3IFJhbmdlUmVzcG9uc2VHZW5lcmF0b3IpOyB9CiAg ICAgflJhbmdlUmVzcG9uc2VHZW5lcmF0b3IoKTsKIAogICAgIGJvb2wgd2lsbFN5bnRoZXNpemVS YW5nZVJlc3BvbnNlcyhXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2sgKiwgUGxhdGZvcm1NZWRp YVJlc291cmNlJiwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYpOwogICAgIGJvb2wgd2lsbEhhbmRs ZVJlcXVlc3QoV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrICosIE5TVVJMUmVxdWVzdCAqKTsK KyAgICB2b2lkIHJlbW92ZVRhc2soV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrICopOwogCiBw cml2YXRlOgorICAgIFJhbmdlUmVzcG9uc2VHZW5lcmF0b3IoKTsKKwogICAgIHN0cnVjdCBEYXRh OwogICAgIGNsYXNzIE1lZGlhUmVzb3VyY2VDbGllbnQ7CiAgICAgdm9pZCBnaXZlUmVzcG9uc2VU b1Rhc2tzV2l0aEZpbmlzaGVkUmFuZ2VzKERhdGEmKTsKICAgICB2b2lkIGdpdmVSZXNwb25zZVRv VGFza0lmQnl0ZXNJblJhbmdlUmVjZWl2ZWQoV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrICos IGNvbnN0IFBhcnNlZFJlcXVlc3RSYW5nZSYsIE9wdGlvbmFsPHNpemVfdD4gZXhwZWN0ZWRDb250 ZW50TGVuZ3RoLCBjb25zdCBEYXRhJik7CiAgICAgc3RhdGljIE9wdGlvbmFsPHNpemVfdD4gZXhw ZWN0ZWRDb250ZW50TGVuZ3RoRnJvbURhdGEoY29uc3QgRGF0YSYpOwotICAgIHZvaWQgcmVtb3Zl VGFzayhXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2sgKik7CiAKICAgICBIYXNoTWFwPFN0cmlu Zywgc3RkOjp1bmlxdWVfcHRyPERhdGE+PiBtX21hcDsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1JhbmdlUmVzcG9uc2VHZW5lcmF0b3IubW0g Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1JhbmdlUmVzcG9uc2VHZW5l cmF0b3IubW0KaW5kZXggN2VkYzJmMWRjYjhmZDQxZDlhOWIzNmQ0MjA1ODVhOGU0NDUyODE4MS4u MTBlZGM4MjEzZDZiZjJhYWE4ZDI0MjQ0MTU0OWZkMTZmZTJiZmQ2YyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9SYW5nZVJlc3BvbnNlR2VuZXJhdG9y Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvUmFuZ2VSZXNw b25zZUdlbmVyYXRvci5tbQpAQCAtNjMsOCArNjMsMTUgQEAgc3RydWN0IFJhbmdlUmVzcG9uc2VH ZW5lcmF0b3I6OkRhdGEgewogICAgIFJlZlB0cjxQbGF0Zm9ybU1lZGlhUmVzb3VyY2U+IHJlc291 cmNlOwogfTsKIAotUmFuZ2VSZXNwb25zZUdlbmVyYXRvcjo6UmFuZ2VSZXNwb25zZUdlbmVyYXRv cigpID0gZGVmYXVsdDsKLVJhbmdlUmVzcG9uc2VHZW5lcmF0b3I6On5SYW5nZVJlc3BvbnNlR2Vu ZXJhdG9yKCkgPSBkZWZhdWx0OworUmFuZ2VSZXNwb25zZUdlbmVyYXRvcjo6UmFuZ2VSZXNwb25z ZUdlbmVyYXRvcigpCit7CisgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKK30KKworUmFuZ2VS ZXNwb25zZUdlbmVyYXRvcjo6flJhbmdlUmVzcG9uc2VHZW5lcmF0b3IoKQoreworICAgIEFTU0VS VChpc01haW5UaHJlYWQoKSk7Cit9CiAKIHN0YXRpYyBSZXNvdXJjZVJlc3BvbnNlIHN5bnRoZXNp emVkUmVzcG9uc2VGb3JSYW5nZShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiBvcmlnaW5hbFJlc3Bv bnNlLCBjb25zdCBQYXJzZWRSZXF1ZXN0UmFuZ2UmIHBhcnNlZFJlcXVlc3RSYW5nZSwgT3B0aW9u YWw8c2l6ZV90PiB0b3RhbENvbnRlbnRMZW5ndGgpCiB7CkBAIC04NiwxNCArOTMsMTEgQEAgc3Rh dGljIFJlc291cmNlUmVzcG9uc2Ugc3ludGhlc2l6ZWRSZXNwb25zZUZvclJhbmdlKGNvbnN0IFJl c291cmNlUmVzcG9uc2UmIG9yaWcKIAogdm9pZCBSYW5nZVJlc3BvbnNlR2VuZXJhdG9yOjpyZW1v dmVUYXNrKFdlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayAqdGFzaykKIHsKLSAgICBjYWxsT25N YWluVGhyZWFkKFt0YXNrID0gcmV0YWluUHRyKHRhc2spLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRy KCp0aGlzKV0gewotICAgICAgICBpZiAoIXdlYWtUaGlzKQotICAgICAgICAgICAgcmV0dXJuOwot ICAgICAgICBhdXRvKiBkYXRhID0gd2Vha1RoaXMtPm1fbWFwLmdldCh0YXNrLmdldCgpLm9yaWdp bmFsUmVxdWVzdC5VUkwuYWJzb2x1dGVTdHJpbmcpOwotICAgICAgICBpZiAoIWRhdGEpCi0gICAg ICAgICAgICByZXR1cm47Ci0gICAgICAgIGRhdGEtPnRhc2tEYXRhLnJlbW92ZSh0YXNrKTsKLSAg ICB9KTsKKyAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOworICAgIGF1dG8qIGRhdGEgPSBtX21h cC5nZXQodGFzay5vcmlnaW5hbFJlcXVlc3QuVVJMLmFic29sdXRlU3RyaW5nKTsKKyAgICBpZiAo IWRhdGEpCisgICAgICAgIHJldHVybjsKKyAgICBkYXRhLT50YXNrRGF0YS5yZW1vdmUodGFzayk7 CiB9CiAKIHZvaWQgUmFuZ2VSZXNwb25zZUdlbmVyYXRvcjo6Z2l2ZVJlc3BvbnNlVG9UYXNrSWZC eXRlc0luUmFuZ2VSZWNlaXZlZChXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2sgKnRhc2ssIGNv bnN0IFBhcnNlZFJlcXVlc3RSYW5nZSYgcmFuZ2UsIE9wdGlvbmFsPHNpemVfdD4gZXhwZWN0ZWRD b250ZW50TGVuZ3RoLCBjb25zdCBEYXRhJiBkYXRhKQpAQCAtMTMwLDggKzEzNCwxMCBAQCB2b2lk IFJhbmdlUmVzcG9uc2VHZW5lcmF0b3I6OmdpdmVSZXNwb25zZVRvVGFza0lmQnl0ZXNJblJhbmdl UmVjZWl2ZWQoV2ViQ29yZU5TVQogICAgICAgICB9CiAgICAgICAgIGlmIChieXRlSW5kZXggPj0g cmFuZ2UuZW5kKSB7CiAgICAgICAgICAgICBbdGFzayByZXNvdXJjZUZpbmlzaGVkOm51bGxwdHIg bWV0cmljczpOZXR3b3JrTG9hZE1ldHJpY3MgeyB9XTsKLSAgICAgICAgICAgIGlmIChnZW5lcmF0 b3IpCi0gICAgICAgICAgICAgICAgZ2VuZXJhdG9yLT5yZW1vdmVUYXNrKHRhc2suZ2V0KCkpOwor ICAgICAgICAgICAgY2FsbE9uTWFpblRocmVhZChbZ2VuZXJhdG9yLCB0YXNrXSB7CisgICAgICAg ICAgICAgICAgaWYgKGdlbmVyYXRvcikKKyAgICAgICAgICAgICAgICAgICAgZ2VuZXJhdG9yLT5y ZW1vdmVUYXNrKHRhc2suZ2V0KCkpOworICAgICAgICAgICAgfSk7CiAgICAgICAgIH0KICAgICB9 OwogCkBAIC0yNjYsMTcgKzI3MiwxMyBAQCBwcml2YXRlOgogICAgICAgICBkYXRhLT5yZXNvdXJj ZSA9IG51bGxwdHI7CiAgICAgICAgIG1fZ2VuZXJhdG9yLT5naXZlUmVzcG9uc2VUb1Rhc2tzV2l0 aEZpbmlzaGVkUmFuZ2VzKCpkYXRhKTsKICAgICB9Ci0gICAgCisKICAgICBXZWFrUHRyPFJhbmdl UmVzcG9uc2VHZW5lcmF0b3I+IG1fZ2VuZXJhdG9yOwogICAgIGNvbnN0IFN0cmluZyBtX3VybFN0 cmluZzsKIH07CiAKIGJvb2wgUmFuZ2VSZXNwb25zZUdlbmVyYXRvcjo6d2lsbFN5bnRoZXNpemVS YW5nZVJlc3BvbnNlcyhXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2sgKnRhc2ssIFBsYXRmb3Jt TWVkaWFSZXNvdXJjZSYgcmVzb3VyY2UsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNl KQogewotICAgIGJvb2wgcmFuZ2VSZXNwb25zZUdlbmVyYXRvckRpc2FibGVkID0gdHJ1ZTsKLSAg ICBpZiAocmFuZ2VSZXNwb25zZUdlbmVyYXRvckRpc2FibGVkKQotICAgICAgICByZXR1cm4gZmFs c2U7Ci0KICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogICAgIE5TVVJMUmVxdWVzdCAqb3Jp Z2luYWxSZXF1ZXN0ID0gdGFzay5vcmlnaW5hbFJlcXVlc3Q7CiAgICAgaWYgKCFvcmlnaW5hbFJl cXVlc3QuVVJMKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9j b2NvYS9XZWJDb3JlTlNVUkxTZXNzaW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24uaAppbmRleCA2MDFhNWRjNDA4ZDAxNzg1MTc3 NWI3ZWYwNzllYWU5NWVkZTIyZWVjLi45ZDAwNTU4MWFkZWMwY2M0YzY1OGQ4Y2VlNzRmYWI1ZDBh NzJkNmI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29h L1dlYkNvcmVOU1VSTFNlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24uaApAQCAtNzQsNyArNzQsNyBAQCBXRUJDT1JF X0VYUE9SVCBAaW50ZXJmYWNlIFdlYkNvcmVOU1VSTFNlc3Npb24gOiBOU09iamVjdCB7CiAgICAg TlNVSW50ZWdlciBfbmV4dFRhc2tJZGVudGlmaWVyOwogICAgIE9TT2JqZWN0UHRyPGRpc3BhdGNo X3F1ZXVlX3Q+IF9pbnRlcm5hbFF1ZXVlOwogICAgIFdlYkNvcmVOU1VSTFNlc3Npb25DT1JTQWNj ZXNzQ2hlY2tSZXN1bHRzIF9jb3JzUmVzdWx0czsKLSAgICBXZWJDb3JlOjpSYW5nZVJlc3BvbnNl R2VuZXJhdG9yIF9yYW5nZVJlc3BvbnNlR2VuZXJhdG9yOworICAgIFJlZlB0cjxXZWJDb3JlOjpS YW5nZVJlc3BvbnNlR2VuZXJhdG9yPiBfcmFuZ2VSZXNwb25zZUdlbmVyYXRvcjsKIH0KIC0gKGlk KWluaXRXaXRoUmVzb3VyY2VMb2FkZXI6KFdlYkNvcmU6OlBsYXRmb3JtTWVkaWFSZXNvdXJjZUxv YWRlciYpbG9hZGVyIGRlbGVnYXRlOihpZDxOU1VSTFNlc3Npb25UYXNrRGVsZWdhdGU+KWRlbGVn YXRlIGRlbGVnYXRlUXVldWU6KE5TT3BlcmF0aW9uUXVldWUqKXF1ZXVlOwogQHByb3BlcnR5IChy ZWFkb25seSwgcmV0YWluKSBOU09wZXJhdGlvblF1ZXVlICpkZWxlZ2F0ZVF1ZXVlOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJDb3JlTlNVUkxT ZXNzaW9uLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJDb3Jl TlNVUkxTZXNzaW9uLm1tCmluZGV4IDY1M2I4ZWVlMjdkNGM1NjY3MjkxYjhlN2RiYTE1NGNiYjI3 Y2EyMjUuLjZjZGMzZTAwNzNlMTA2YTc2MjVhNmExODkxZjg1ZGE1MjRhY2M4MmEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5TVVJMU2Vz c2lvbi5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNv cmVOU1VSTFNlc3Npb24ubW0KQEAgLTIzNCw2ICsyMzQsNyBAQCBOU19BU1NVTUVfTk9OTlVMTF9F TkQKICAgICBzZWxmLmRlbGVnYXRlID0gaW5EZWxlZ2F0ZTsKICAgICBfcXVldWUgPSBpblF1ZXVl ID8gaW5RdWV1ZSA6IFtOU09wZXJhdGlvblF1ZXVlIG1haW5RdWV1ZV07CiAgICAgX2ludGVybmFs UXVldWUgPSBhZG9wdE9TT2JqZWN0KGRpc3BhdGNoX3F1ZXVlX2NyZWF0ZSgiV2ViQ29yZU5TVVJM U2Vzc2lvbiBfaW50ZXJuYWxRdWV1ZSIsIERJU1BBVENIX1FVRVVFX1NFUklBTCkpOworICAgIF9y YW5nZVJlc3BvbnNlR2VuZXJhdG9yID0gUmFuZ2VSZXNwb25zZUdlbmVyYXRvcjo6Y3JlYXRlKCk7 CiAKICAgICByZXR1cm4gc2VsZjsKIH0KQEAgLTMwNiw3ICszMDcsNyBAQCBOU19BU1NVTUVfTk9O TlVMTF9FTkQKIAogLSAoV2ViQ29yZTo6UmFuZ2VSZXNwb25zZUdlbmVyYXRvciYpcmFuZ2VSZXNw b25zZUdlbmVyYXRvcgogewotICAgIHJldHVybiBfcmFuZ2VSZXNwb25zZUdlbmVyYXRvcjsKKyAg ICByZXR1cm4gKl9yYW5nZVJlc3BvbnNlR2VuZXJhdG9yOwogfQogCiAjcHJhZ21hIG1hcmsgLSBO U1VSTFNlc3Npb24gQVBJCkBAIC03MDQsNiArNzA1LDggQEAgdm9pZCBXZWJDb3JlTlNVUkxTZXNz aW9uRGF0YVRhc2tDbGllbnQ6OmxvYWRGaW5pc2hlZChQbGF0Zm9ybU1lZGlhUmVzb3VyY2UmIHJl c28KICAgICAgICAgX3Jlc291cmNlLT5zZXRDbGllbnQobnVsbHB0cik7CiAgICAgICAgIF9yZXNv dXJjZSA9IG5pbDsKICAgICB9CisgICAgaWYgKGF1dG8gKnNlc3Npb24gPSBzZWxmLnNlc3Npb24p CisgICAgICAgIFtzZXNzaW9uIHJhbmdlUmVzcG9uc2VHZW5lcmF0b3JdLnJlbW92ZVRhc2soc2Vs Zik7CiB9CiAKICNwcmFnbWEgbWFyayAtIE5TVVJMU2Vzc2lvbiBBUEkKQEAgLTgxMiw4ICs4MTUs MTAgQEAgdm9pZCBXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2tDbGllbnQ6OmxvYWRGaW5pc2hl ZChQbGF0Zm9ybU1lZGlhUmVzb3VyY2UmIHJlc28KICAgICBzZWxmLmNvdW50T2ZCeXRlc0V4cGVj dGVkVG9SZWNlaXZlID0gcmVzcG9uc2UuZXhwZWN0ZWRDb250ZW50TGVuZ3RoKCk7CiAgICAgUmV0 YWluUHRyPE5TVVJMUmVzcG9uc2U+IHN0cm9uZ1Jlc3BvbnNlID0gcmVzcG9uc2UubnNVUkxSZXNw b25zZSgpOwogCi0gICAgaWYgKHJlc291cmNlICYmIHNlbGYuc2Vzc2lvbiAmJiBbc2VsZi5zZXNz aW9uIHJhbmdlUmVzcG9uc2VHZW5lcmF0b3JdLndpbGxTeW50aGVzaXplUmFuZ2VSZXNwb25zZXMo c2VsZiwgKnJlc291cmNlLCByZXNwb25zZSkpCisgICAgaWYgKHJlc291cmNlICYmIHNlbGYuc2Vz c2lvbiAmJiBbc2VsZi5zZXNzaW9uIHJhbmdlUmVzcG9uc2VHZW5lcmF0b3JdLndpbGxTeW50aGVz aXplUmFuZ2VSZXNwb25zZXMoc2VsZiwgKnJlc291cmNlLCByZXNwb25zZSkpIHsKKyAgICAgICAg X3Jlc291cmNlID0gbnVsbHB0cjsKICAgICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5kbGVyKFNo b3VsZENvbnRpbnVlUG9saWN5Q2hlY2s6Olllcyk7CisgICAgfQogICAgIAogICAgIFJldGFpblB0 cjxXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2s+IHN0cm9uZ1NlbGYgeyBzZWxmIH07CiAgICAg aWYgKCFzZWxmLnNlc3Npb24pCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9D aGFuZ2VMb2cKaW5kZXggMDMyNGFiN2Y2MDUzOTcxYjQzNzAyMjczNTk4NGQ0ZmQ3MzIwMWNlYS4u NmFhM2JiYmRjZDdkZGRjM2E3OGU5YWU3NWQ3Y2M0YWMxYjFiYWYzZiAxMDA2NDQKLS0tIGEvVG9v bHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIx LTAyLTE3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgRml4IGEgZmV3IGlzc3VlcyB3aXRoIFJhbmdlUmVzcG9uc2VHZW5lcmF0b3IKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjA4NworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9NZWRpYUxvYWRpbmcubW06CisgICAgICAgIChUZXN0V2ViS2l0 QVBJOjpURVNUKToKKwogMjAyMS0wMi0xNyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNl bkB3ZWJraXQub3JnPgogCiAgICAgICAgIEVmZmVjdGl2ZWx5IHJldmVydCByMjcyOTA4CmRpZmYg LS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL01lZGlhTG9hZGlu Zy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTWVkaWFMb2FkaW5n Lm1tCmluZGV4IDNjZTA1MThkZDEwOGZiNTYwNzI4YWJhMjU5YjE1NGFmYjc2MjVlNDYuLjhmOGFi MjBhM2I5ODkxMjVkYjgwMTAxZDFjMzA3ZDRmNjhkM2QxMzggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTWVkaWFMb2FkaW5nLm1tCisrKyBiL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTWVkaWFMb2FkaW5nLm1tCkBAIC0xNTIs NyArMTUyLDcgQEAgVEVTVChNZWRpYUxvYWRpbmcsIFJhbmdlUmVxdWVzdFN5bnRoZXNpc1dpdGhD b250ZW50TGVuZ3RoKQogICAgICAgICB7Ii8iLCB7IHZpZGVvUGxheVRlc3RIVE1MIH19LAogICAg ICAgICB7Ii92aWRlby5tcDQiLCB7IHRlc3RWaWRlb0J5dGVzKCkgfX0KICAgICB9KTsKLSAgICBy dW5WaWRlb1Rlc3Qoc2VydmVyLnJlcXVlc3QoKSwgImVycm9yIik7CisgICAgcnVuVmlkZW9UZXN0 KHNlcnZlci5yZXF1ZXN0KCksICJwbGF5aW5nIik7CiAgICAgRVhQRUNUX0VRKHNlcnZlci50b3Rh bFJlcXVlc3RzKCksIDJ1KTsKIH0KIAo=