154096 2016-02-10 16:25:37 -0800 Use BlobResourceHandle when loading blob urls, even when using NetworkSession 2016-02-11 11:50:42 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen beidson oldest_to_newest 1163662 0 achristensen 2016-02-10 16:25:37 -0800 Use BlobResourceHandle when loading blob urls, even when using NetworkSession 1163670 1 271038 achristensen 2016-02-10 16:38:15 -0800 Created attachment 271038 Patch 1163806 2 achristensen 2016-02-11 11:50:42 -0800 http://trac.webkit.org/changeset/196428 271038 2016-02-10 16:38:15 -0800 2016-02-11 09:30:09 -0800 Patch bug-154096-20160210163753.patch text/plain 15086 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NjQwMSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ3IEBACisyMDE2LTAyLTEwICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVXNlIEJsb2JS ZXNvdXJjZUhhbmRsZSB3aGVuIGxvYWRpbmcgYmxvYiB1cmxzLCBldmVuIHdoZW4gdXNpbmcgTmV0 d29ya1Nlc3Npb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE1NDA5NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAg ICAKKyAgICAgICAgVGhpcyBmaXhlcyBhdCBsZWFzdCBodHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0 L2Jsb2ItcmVxdWVzdC1ieXRlLXJhbmdlLmh0bWwuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9OZXR3b3JrRGF0YVRhc2suaDoKKyAgICAgICAgUmVuYW1lZCBOZXR3b3JrRGF0YVRhc2tDbGll bnQ6OmRpZFJlY2VpdmVSZXNwb25zZSB0byBkaWRSZWNlaXZlUmVzcG9uc2VOZXR3b3JrU2Vzc2lv bgorICAgICAgICB0byBhdm9pZCBjb25mbGljdGluZyB3aXRoIFJlc291cmNlSGFuZGxlQ2xpZW50 OjpkaWRSZWNlaXZlUmVzcG9uc2UuCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xv YWQuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrTG9hZDo6TmV0d29ya0xvYWQpOgorICAg ICAgICBNYWtlIGEgQmxvYlJlc291cmNlSGFuZGxlIGluc3RlYWQgb2YgYSBOZXR3b3JrRGF0YVRh c2sgaWYgd2UgaGF2ZSBhIHJlcXVlc3QgZm9yIGEgYmxvYiB1cmwuCisgICAgICAgIChXZWJLaXQ6 Ok5ldHdvcmtMb2FkOjp+TmV0d29ya0xvYWQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrTG9h ZDo6c2V0RGVmZXJzTG9hZGluZyk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtMb2FkOjpjYW5j ZWwpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrTG9hZDo6Y29udGludWVXaWxsU2VuZFJlcXVl c3QpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrTG9hZDo6Y29udGludWVEaWRSZWNlaXZlUmVz cG9uc2UpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrTG9hZDo6c2hhcmVkRGlkUmVjZWl2ZVJl c3BvbnNlKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0xvYWQ6OmNvbnZlcnRUYXNrVG9Eb3du bG9hZCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtMb2FkOjpzZXRQZW5kaW5nRG93bmxvYWRJ RCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtMb2FkOjpkaWRSZWNlaXZlQ2hhbGxlbmdlKToK KyAgICAgICAgKFdlYktpdDo6TmV0d29ya0xvYWQ6OmRpZFJlY2VpdmVSZXNwb25zZU5ldHdvcmtT ZXNzaW9uKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0xvYWQ6OmNhbm5vdFNob3dVUkwpOgor ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrTG9hZDo6ZGlkUmVjZWl2ZVJlc3BvbnNlQXN5bmMpOgor ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrTG9hZDo6d2lsbFNlbmRSZXF1ZXN0QXN5bmMpOgorICAg ICAgICAoV2ViS2l0OjpOZXR3b3JrTG9hZDo6Y2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rp b25TcGFjZUFzeW5jKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0xvYWQ6OmNvbnRpbnVlQ2Fu QXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFjZSk6CisgICAgICAgIChXZWJLaXQ6Ok5l dHdvcmtMb2FkOjpzdXBwb3J0c0RhdGFBcnJheSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtM b2FkOjpkaWRSZWNlaXZlRGF0YUFycmF5KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0xvYWQ6 OmRpZFNlbmREYXRhKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0xvYWQ6OnJlY2VpdmVkQ2Fu Y2VsbGF0aW9uKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0xvYWQ6OmRpZFJlY2VpdmVSZXNw b25zZSk6IERlbGV0ZWQuCisgICAgICAgIENvbXBpbGUgUmVzb3VyY2VIYW5kbGVDbGllbnQgd2hl biB1c2luZyBOZXR3b3JrU2Vzc2lvbiBiZWNhdXNlIGl0IGlzIHVzZWQgZm9yIGJsb2JzIG5vdy4K KyAgICAgICAgQWxzbywgYWRkIG51bGwgY2hlY2tzIGJlY2F1c2Ugd2Ugbm93IGhhdmUgTmV0d29y a0xvYWRzIHdoZXJlIGVpdGhlciBtX3Rhc2sgb3IgbV9oYW5kbGUgaXMgYWx3YXlzIG51bGwuCisg ICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWQuaDoKKyAgICAgICAgKFdlYktpdDo6 TmV0d29ya0xvYWQ6OnBlbmRpbmdEb3dubG9hZElEKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tOgorICAgICAgICAoLVtXS05ldHdvcmtTZXNz aW9uRGVsZWdhdGUgVVJMU2Vzc2lvbjpkYXRhVGFzazpkaWRSZWNlaXZlUmVzcG9uc2U6Y29tcGxl dGlvbkhhbmRsZXI6XSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvbWFjL05ldHdvcmtMb2Fk TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrTG9hZDo6d2lsbENhY2hlUmVzcG9uc2VB c3luYyk6CisKIDIwMTYtMDItMTAgIEppZXdlbiBUYW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4K IAogICAgICAgICBSZW5hbWUgKkV2ZW50OjpjcmVhdGUqIHdoaWNoIGNyZWF0ZXMgZXZlbnRzIGZv ciBiaW5kaW5ncyB0byAqRXZlbnQ6OmNyZWF0ZUZvckJpbmRpbmdzKiBhbmQgY2xlYW51cCBjb3Jy ZXNwb25kaW5nIHBhdGhzCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrRGF0YVRhc2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vz cy9OZXR3b3JrRGF0YVRhc2suaAkocmV2aXNpb24gMTk2MzIzKQorKysgU291cmNlL1dlYktpdDIv TmV0d29ya1Byb2Nlc3MvTmV0d29ya0RhdGFUYXNrLmgJKHdvcmtpbmcgY29weSkKQEAgLTY1LDcg KzY1LDcgQEAgY2xhc3MgTmV0d29ya0RhdGFUYXNrQ2xpZW50IHsKIHB1YmxpYzoKICAgICB2aXJ0 dWFsIHZvaWQgd2lsbFBlcmZvcm1IVFRQUmVkaXJlY3Rpb24oY29uc3QgV2ViQ29yZTo6UmVzb3Vy Y2VSZXNwb25zZSYsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIFJlZGlyZWN0Q29t cGxldGlvbkhhbmRsZXIpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZUNoYWxsZW5n ZShjb25zdCBXZWJDb3JlOjpBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSYsIENoYWxsZW5nZUNvbXBs ZXRpb25IYW5kbGVyKSA9IDA7Ci0gICAgdmlydHVhbCB2b2lkIGRpZFJlY2VpdmVSZXNwb25zZShj b25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiwgUmVzcG9uc2VDb21wbGV0aW9uSGFuZGxl cikgPSAwOworICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZlUmVzcG9uc2VOZXR3b3JrU2Vzc2lv bihjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiwgUmVzcG9uc2VDb21wbGV0aW9uSGFu ZGxlcikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZlRGF0YShSZWZQdHI8V2ViQ29y ZTo6U2hhcmVkQnVmZmVyPiYmKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpZENvbXBsZXRlV2l0 aEVycm9yKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImKSA9IDA7CiAgICAgdmlydHVhbCB2 b2lkIGRpZEJlY29tZURvd25sb2FkKCkgPSAwOwpJbmRleDogU291cmNlL1dlYktpdDIvTmV0d29y a1Byb2Nlc3MvTmV0d29ya0xvYWQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05l dHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmNwcAkocmV2aXNpb24gMTk2Mzg0KQorKysgU291cmNl L1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWQuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zMiwxMyArMzIsMTAgQEAKICNpbmNsdWRlICJTZXNzaW9uVHJhY2tlci5oIgogI2luY2x1ZGUg IldlYkVycm9ycy5oIgogI2luY2x1ZGUgPFdlYkNvcmUvTm90SW1wbGVtZW50ZWQuaD4KKyNpbmNs dWRlIDxXZWJDb3JlL1Jlc291cmNlSGFuZGxlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TZXNzaW9u SUQuaD4KICNpbmNsdWRlIDx3dGYvTWFpblRocmVhZC5oPgogCi0jaWYgIVVTRShORVRXT1JLX1NF U1NJT04pCi0jaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZUhhbmRsZS5oPgotI2VuZGlmCi0KIG5h bWVzcGFjZSBXZWJLaXQgewogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKQEAgLTUyLDYgKzQ5 LDEwIEBAIE5ldHdvcmtMb2FkOjpOZXR3b3JrTG9hZChOZXR3b3JrTG9hZENsaWUKICAgICAsIG1f Y3VycmVudFJlcXVlc3QocGFyYW1ldGVycy5yZXF1ZXN0KQogewogI2lmIFVTRShORVRXT1JLX1NF U1NJT04pCisgICAgaWYgKHBhcmFtZXRlcnMucmVxdWVzdC51cmwoKS5wcm90b2NvbElzKCJibG9i IikpIHsKKyAgICAgICAgbV9oYW5kbGUgPSBSZXNvdXJjZUhhbmRsZTo6Y3JlYXRlKG51bGxwdHIs IHBhcmFtZXRlcnMucmVxdWVzdCwgdGhpcywgcGFyYW1ldGVycy5kZWZlcnNMb2FkaW5nLCBwYXJh bWV0ZXJzLmNvbnRlbnRTbmlmZmluZ1BvbGljeSA9PSBTbmlmZkNvbnRlbnQpOworICAgICAgICBy ZXR1cm47CisgICAgfQogICAgIGlmIChhdXRvKiBuZXR3b3JrU2Vzc2lvbiA9IFNlc3Npb25UcmFj a2VyOjpuZXR3b3JrU2Vzc2lvbihwYXJhbWV0ZXJzLnNlc3Npb25JRCkpIHsKICAgICAgICAgbV90 YXNrID0gTmV0d29ya0RhdGFUYXNrOjpjcmVhdGUoKm5ldHdvcmtTZXNzaW9uLCAqdGhpcywgcGFy YW1ldGVycy5yZXF1ZXN0LCBwYXJhbWV0ZXJzLmFsbG93U3RvcmVkQ3JlZGVudGlhbHMpOwogICAg ICAgICBpZiAoIXBhcmFtZXRlcnMuZGVmZXJzTG9hZGluZykKQEAgLTcwLDIzICs3MSwyMyBAQCBO ZXR3b3JrTG9hZDo6fk5ldHdvcmtMb2FkKCkKICNpZiBVU0UoTkVUV09SS19TRVNTSU9OKQogICAg IGlmIChtX3Jlc3BvbnNlQ29tcGxldGlvbkhhbmRsZXIpCiAgICAgICAgIG1fcmVzcG9uc2VDb21w bGV0aW9uSGFuZGxlcihQb2xpY3lJZ25vcmUpOwotI2Vsc2UKKyNlbmRpZgogICAgIGlmIChtX2hh bmRsZSkKICAgICAgICAgbV9oYW5kbGUtPmNsZWFyQ2xpZW50KCk7Ci0jZW5kaWYKIH0KIAogdm9p ZCBOZXR3b3JrTG9hZDo6c2V0RGVmZXJzTG9hZGluZyhib29sIGRlZmVycykKIHsKICNpZiBVU0Uo TkVUV09SS19TRVNTSU9OKQotICAgIGlmIChkZWZlcnMpCi0gICAgICAgIG1fdGFzay0+c3VzcGVu ZCgpOwotICAgIGVsc2UKLSAgICAgICAgbV90YXNrLT5yZXN1bWUoKTsKLSNlbHNlCisgICAgaWYg KG1fdGFzaykgeworICAgICAgICBpZiAoZGVmZXJzKQorICAgICAgICAgICAgbV90YXNrLT5zdXNw ZW5kKCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIG1fdGFzay0+cmVzdW1lKCk7CisgICAg fQorI2VuZGlmCiAgICAgaWYgKG1faGFuZGxlKQogICAgICAgICBtX2hhbmRsZS0+c2V0RGVmZXJz TG9hZGluZyhkZWZlcnMpOwotI2VuZGlmCiB9CiAKIHZvaWQgTmV0d29ya0xvYWQ6OmNhbmNlbCgp CkBAIC05NCwxMCArOTUsOSBAQCB2b2lkIE5ldHdvcmtMb2FkOjpjYW5jZWwoKQogI2lmIFVTRShO RVRXT1JLX1NFU1NJT04pCiAgICAgaWYgKG1fdGFzaykKICAgICAgICAgbV90YXNrLT5jYW5jZWwo KTsKLSNlbHNlCisjZW5kaWYKICAgICBpZiAobV9oYW5kbGUpCiAgICAgICAgIG1faGFuZGxlLT5j YW5jZWwoKTsKLSNlbmRpZgogfQogCiB2b2lkIE5ldHdvcmtMb2FkOjpjb250aW51ZVdpbGxTZW5k UmVxdWVzdChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIG5ld1JlcXVlc3QpCkBAIC0x MTAsMjEgKzExMCwxOCBAQCB2b2lkIE5ldHdvcmtMb2FkOjpjb250aW51ZVdpbGxTZW5kUmVxdWVz CiAjZW5kaWYKIAogICAgIGlmIChtX2N1cnJlbnRSZXF1ZXN0LmlzTnVsbCgpKSB7Ci0jaWYgVVNF KE5FVFdPUktfU0VTU0lPTikKLSAgICAgICAgbV9jbGllbnQuZGlkRmFpbExvYWRpbmcoY2FuY2Vs bGVkRXJyb3IobV9jdXJyZW50UmVxdWVzdCkpOwotI2Vsc2UKLSAgICAgICAgbV9oYW5kbGUtPmNh bmNlbCgpOworICAgICAgICBpZiAobV9oYW5kbGUpCisgICAgICAgICAgICBtX2hhbmRsZS0+Y2Fu Y2VsKCk7CiAgICAgICAgIGRpZEZhaWwobV9oYW5kbGUuZ2V0KCksIGNhbmNlbGxlZEVycm9yKG1f Y3VycmVudFJlcXVlc3QpKTsKLSAgICAgICAgcmV0dXJuOwotI2VuZGlmCi0gICAgfQorICAgIH0g ZWxzZSBpZiAobV9oYW5kbGUpCisgICAgICAgIG1faGFuZGxlLT5jb250aW51ZVdpbGxTZW5kUmVx dWVzdChtX2N1cnJlbnRSZXF1ZXN0KTsKIAogI2lmIFVTRShORVRXT1JLX1NFU1NJT04pCiAgICAg QVNTRVJUKG1fcmVkaXJlY3RDb21wbGV0aW9uSGFuZGxlcik7Ci0gICAgbV9yZWRpcmVjdENvbXBs ZXRpb25IYW5kbGVyKG1fY3VycmVudFJlcXVlc3QpOwotICAgIG1fcmVkaXJlY3RDb21wbGV0aW9u SGFuZGxlciA9IG51bGxwdHI7Ci0jZWxzZQotICAgIG1faGFuZGxlLT5jb250aW51ZVdpbGxTZW5k UmVxdWVzdChtX2N1cnJlbnRSZXF1ZXN0KTsKKyAgICBpZiAobV9yZWRpcmVjdENvbXBsZXRpb25I YW5kbGVyKSB7CisgICAgICAgIG1fcmVkaXJlY3RDb21wbGV0aW9uSGFuZGxlcihtX2N1cnJlbnRS ZXF1ZXN0KTsKKyAgICAgICAgbV9yZWRpcmVjdENvbXBsZXRpb25IYW5kbGVyID0gbnVsbHB0cjsK KyAgICB9CiAjZW5kaWYKIH0KIApAQCAtMTMyLDExICsxMjksMTMgQEAgdm9pZCBOZXR3b3JrTG9h ZDo6Y29udGludWVEaWRSZWNlaXZlUmVzcAogewogI2lmIFVTRShORVRXT1JLX1NFU1NJT04pCiAg ICAgQVNTRVJUKG1fcmVzcG9uc2VDb21wbGV0aW9uSGFuZGxlcik7Ci0gICAgbV9yZXNwb25zZUNv bXBsZXRpb25IYW5kbGVyKFBvbGljeVVzZSk7Ci0gICAgbV9yZXNwb25zZUNvbXBsZXRpb25IYW5k bGVyID0gbnVsbHB0cjsKLSNlbHNlCi0gICAgbV9oYW5kbGUtPmNvbnRpbnVlRGlkUmVjZWl2ZVJl c3BvbnNlKCk7CisgICAgaWYgKG1fcmVzcG9uc2VDb21wbGV0aW9uSGFuZGxlcikgeworICAgICAg ICBtX3Jlc3BvbnNlQ29tcGxldGlvbkhhbmRsZXIoUG9saWN5VXNlKTsKKyAgICAgICAgbV9yZXNw b25zZUNvbXBsZXRpb25IYW5kbGVyID0gbnVsbHB0cjsKKyAgICB9CiAjZW5kaWYKKyAgICBpZiAo bV9oYW5kbGUpCisgICAgICAgIG1faGFuZGxlLT5jb250aW51ZURpZFJlY2VpdmVSZXNwb25zZSgp OwogfQogCiBOZXR3b3JrTG9hZENsaWVudDo6U2hvdWxkQ29udGludWVEaWRSZWNlaXZlUmVzcG9u c2UgTmV0d29ya0xvYWQ6OnNoYXJlZERpZFJlY2VpdmVSZXNwb25zZShjb25zdCBSZXNvdXJjZVJl c3BvbnNlJiByZWNlaXZlZFJlc3BvbnNlKQpAQCAtMTY3LDggKzE2NiwxMCBAQCB2b2lkIE5ldHdv cmtMb2FkOjpjb252ZXJ0VGFza1RvRG93bmxvYWQoCiAgICAgbV90YXNrLT5zZXRQZW5kaW5nRG93 bmxvYWRJRChkb3dubG9hZElEKTsKICAgICAKICAgICBBU1NFUlQobV9yZXNwb25zZUNvbXBsZXRp b25IYW5kbGVyKTsKLSAgICBtX3Jlc3BvbnNlQ29tcGxldGlvbkhhbmRsZXIoUG9saWN5RG93bmxv YWQpOwotICAgIG1fcmVzcG9uc2VDb21wbGV0aW9uSGFuZGxlciA9IG51bGxwdHI7CisgICAgaWYg KG1fcmVzcG9uc2VDb21wbGV0aW9uSGFuZGxlcikgeworICAgICAgICBtX3Jlc3BvbnNlQ29tcGxl dGlvbkhhbmRsZXIoUG9saWN5RG93bmxvYWQpOworICAgICAgICBtX3Jlc3BvbnNlQ29tcGxldGlv bkhhbmRsZXIgPSBudWxscHRyOworICAgIH0KIH0KIAogdm9pZCBOZXR3b3JrTG9hZDo6c2V0UGVu ZGluZ0Rvd25sb2FkSUQoRG93bmxvYWRJRCBkb3dubG9hZElEKQpAQCAtMjEzLDcgKzIxNCw3IEBA IHZvaWQgTmV0d29ya0xvYWQ6OmRpZFJlY2VpdmVDaGFsbGVuZ2UoY28KICAgICAgICAgbV9jbGll bnQuY2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFjZUFzeW5jKGNoYWxsZW5nZS5w cm90ZWN0aW9uU3BhY2UoKSk7CiB9CiAKLXZvaWQgTmV0d29ya0xvYWQ6OmRpZFJlY2VpdmVSZXNw b25zZShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgUmVzcG9uc2VDb21wbGV0aW9u SGFuZGxlciBjb21wbGV0aW9uSGFuZGxlcikKK3ZvaWQgTmV0d29ya0xvYWQ6OmRpZFJlY2VpdmVS ZXNwb25zZU5ldHdvcmtTZXNzaW9uKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBS ZXNwb25zZUNvbXBsZXRpb25IYW5kbGVyIGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIEFTU0VS VChpc01haW5UaHJlYWQoKSk7CiAgICAgaWYgKG1fdGFzayAmJiBtX3Rhc2stPnBlbmRpbmdEb3du bG9hZElEKCkuZG93bmxvYWRJRCgpKQpAQCAtMjU5LDcgKzI2MCw3IEBAIHZvaWQgTmV0d29ya0xv YWQ6OmNhbm5vdFNob3dVUkwoKQogICAgIG1fY2xpZW50LmRpZEZhaWxMb2FkaW5nKGNhbm5vdFNo b3dVUkxFcnJvcihtX2N1cnJlbnRSZXF1ZXN0KSk7CiB9CiAgICAgCi0jZWxzZQorI2VuZGlmCiAK IHZvaWQgTmV0d29ya0xvYWQ6OmRpZFJlY2VpdmVSZXNwb25zZUFzeW5jKFJlc291cmNlSGFuZGxl KiBoYW5kbGUsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlY2VpdmVkUmVzcG9uc2UpCiB7CkBA IC0zMDEsOSArMzAyLDcgQEAgdm9pZCBOZXR3b3JrTG9hZDo6d2lsbFNlbmRSZXF1ZXN0QXN5bmMo UgogICAgIHNoYXJlZFdpbGxTZW5kUmVkaXJlY3RlZFJlcXVlc3QocmVxdWVzdCwgcmVkaXJlY3RS ZXNwb25zZSk7CiB9CiAKLSNlbmRpZiAvLyBVU0UoTkVUV09SS19TRVNTSU9OKQotCi0jaWYgVVNF KFBST1RFQ1RJT05fU1BBQ0VfQVVUSF9DQUxMQkFDSykgJiYgIVVTRShORVRXT1JLX1NFU1NJT04p CisjaWYgVVNFKFBST1RFQ1RJT05fU1BBQ0VfQVVUSF9DQUxMQkFDSykKIHZvaWQgTmV0d29ya0xv YWQ6OmNhbkF1dGhlbnRpY2F0ZUFnYWluc3RQcm90ZWN0aW9uU3BhY2VBc3luYyhSZXNvdXJjZUhh bmRsZSogaGFuZGxlLCBjb25zdCBQcm90ZWN0aW9uU3BhY2UmIHByb3RlY3Rpb25TcGFjZSkKIHsK ICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwpAQCAtMzMyLDYgKzMzMSw3IEBAIHZvaWQg TmV0d29ya0xvYWQ6OmNhbkF1dGhlbnRpY2F0ZUFnYWluc3QKIHZvaWQgTmV0d29ya0xvYWQ6OmNv bnRpbnVlQ2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFjZShib29sIHJlc3VsdCkK IHsKICNpZiBVU0UoTkVUV09SS19TRVNTSU9OKQorICAgIEFTU0VSVF9XSVRIX01FU1NBR0UoIW1f aGFuZGxlLCAiQmxvYnMgc2hvdWxkIG5ldmVyIGdpdmUgYXV0aGVudGljYXRpb24gY2hhbGxlbmdl cyIpOwogICAgIEFTU0VSVChtX2NoYWxsZW5nZUNvbXBsZXRpb25IYW5kbGVyKTsKICAgICBhdXRv IGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShtX2NoYWxsZW5nZUNvbXBsZXRpb25IYW5kbGVy KTsKICAgICBpZiAoIXJlc3VsdCkgewpAQCAtMzU5LDcgKzM1OSw3IEBAIHZvaWQgTmV0d29ya0xv YWQ6OmNvbnRpbnVlQ2FuQXV0aGVudGljYXQKIH0KICNlbmRpZgogCi0jaWYgVVNFKE5FVFdPUktf Q0ZEQVRBX0FSUkFZX0NBTExCQUNLKSAmJiAhVVNFKE5FVFdPUktfU0VTU0lPTikKKyNpZiBVU0Uo TkVUV09SS19DRkRBVEFfQVJSQVlfQ0FMTEJBQ0spCiBib29sIE5ldHdvcmtMb2FkOjpzdXBwb3J0 c0RhdGFBcnJheSgpCiB7CiAgICAgbm90SW1wbGVtZW50ZWQoKTsKQEAgLTM3Myw4ICszNzMsNiBA QCB2b2lkIE5ldHdvcmtMb2FkOjpkaWRSZWNlaXZlRGF0YUFycmF5KFJlCiB9CiAjZW5kaWYKIAot I2lmICFVU0UoTkVUV09SS19TRVNTSU9OKQotCiB2b2lkIE5ldHdvcmtMb2FkOjpkaWRTZW5kRGF0 YShSZXNvdXJjZUhhbmRsZSogaGFuZGxlLCB1bnNpZ25lZCBsb25nIGxvbmcgYnl0ZXNTZW50LCB1 bnNpZ25lZCBsb25nIGxvbmcgdG90YWxCeXRlc1RvQmVTZW50KQogewogICAgIEFTU0VSVF9VTlVT RUQoaGFuZGxlLCBoYW5kbGUgPT0gbV9oYW5kbGUpOwpAQCAtNDM4LDYgKzQzNiw0IEBAIHZvaWQg TmV0d29ya0xvYWQ6OnJlY2VpdmVkQ2FuY2VsbGF0aW9uKFIKICAgICBkaWRGYWlsKG1faGFuZGxl LmdldCgpLCBjYW5jZWxsZWRFcnJvcihtX2N1cnJlbnRSZXF1ZXN0KSk7CiB9CiAKLSNlbmRpZiAv LyAhVVNFKE5FVFdPUktfU0VTU0lPTikKLQogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmgJKHJldmlzaW9uIDE5 NjMyMykKKysrIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmgJKHdv cmtpbmcgY29weSkKQEAgLTI5LDIyICsyOSwxOSBAQAogI2luY2x1ZGUgIk5ldHdvcmtMb2FkQ2xp ZW50LmgiCiAjaW5jbHVkZSAiTmV0d29ya0xvYWRQYXJhbWV0ZXJzLmgiCiAjaW5jbHVkZSAiUmVt b3RlTmV0d29ya2luZ0NvbnRleHQuaCIKKyNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNlSGFuZGxl Q2xpZW50Lmg+CiAKICNpZiBVU0UoTkVUV09SS19TRVNTSU9OKQogI2luY2x1ZGUgIkRvd25sb2Fk SUQuaCIKICNpbmNsdWRlICJOZXR3b3JrU2Vzc2lvbi5oIgogI2luY2x1ZGUgPFdlYkNvcmUvQXV0 aGVudGljYXRpb25DaGFsbGVuZ2UuaD4KLSNlbHNlCi0jaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJj ZUhhbmRsZUNsaWVudC5oPgogI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1jbGFzcyBO ZXR3b3JrTG9hZAorY2xhc3MgTmV0d29ya0xvYWQgOiBwdWJsaWMgV2ViQ29yZTo6UmVzb3VyY2VI YW5kbGVDbGllbnQKICNpZiBVU0UoTkVUV09SS19TRVNTSU9OKQotICAgIDogcHVibGljIE5ldHdv cmtEYXRhVGFza0NsaWVudAotI2Vsc2UKLSAgICA6IHB1YmxpYyBXZWJDb3JlOjpSZXNvdXJjZUhh bmRsZUNsaWVudAorICAgICwgcHVibGljIE5ldHdvcmtEYXRhVGFza0NsaWVudAogI2VuZGlmCiB7 CiBwdWJsaWM6CkBAIC02NiwxNyArNjMsMTcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0UGVuZGlu Z0Rvd25sb2FkKFBlbmRpbmdEb3dubG9hZCYpOwogICAgIERvd25sb2FkSUQgcGVuZGluZ0Rvd25s b2FkSUQoKSB7IHJldHVybiBtX3Rhc2stPnBlbmRpbmdEb3dubG9hZElEKCk7IH0KICAgICAKLSAg ICAvLyBOZXR3b3JrU2Vzc2lvblRhc2tDbGllbnQuCi0gICAgdmlydHVhbCB2b2lkIHdpbGxQZXJm b3JtSFRUUFJlZGlyZWN0aW9uKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmLCBjb25z dCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoY29uc3QgV2Vi Q29yZTo6UmVzb3VyY2VSZXF1ZXN0Jik+KSBmaW5hbCBvdmVycmlkZTsKLSAgICB2aXJ0dWFsIHZv aWQgZGlkUmVjZWl2ZUNoYWxsZW5nZShjb25zdCBXZWJDb3JlOjpBdXRoZW50aWNhdGlvbkNoYWxs ZW5nZSYsIHN0ZDo6ZnVuY3Rpb248dm9pZChBdXRoZW50aWNhdGlvbkNoYWxsZW5nZURpc3Bvc2l0 aW9uLCBjb25zdCBXZWJDb3JlOjpDcmVkZW50aWFsJik+KSBmaW5hbCBvdmVycmlkZTsKLSAgICB2 aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZVJlc3BvbnNlKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVz cG9uc2UmLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoV2ViQ29yZTo6UG9saWN5QWN0aW9uKT4pIGZpbmFs IG92ZXJyaWRlOworICAgIC8vIE5ldHdvcmtEYXRhVGFza0NsaWVudAorICAgIHZpcnR1YWwgdm9p ZCB3aWxsUGVyZm9ybUhUVFBSZWRpcmVjdGlvbihjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3Bv bnNlJiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgUmVkaXJlY3RDb21wbGV0aW9u SGFuZGxlcikgZmluYWwgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIGRpZFJlY2VpdmVDaGFs bGVuZ2UoY29uc3QgV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2UmLCBDaGFsbGVuZ2VD b21wbGV0aW9uSGFuZGxlcikgZmluYWwgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIGRpZFJl Y2VpdmVSZXNwb25zZU5ldHdvcmtTZXNzaW9uKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9u c2UmLCBSZXNwb25zZUNvbXBsZXRpb25IYW5kbGVyKSBmaW5hbCBvdmVycmlkZTsKICAgICB2aXJ0 dWFsIHZvaWQgZGlkUmVjZWl2ZURhdGEoUmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4mJikg ZmluYWwgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGRpZENvbXBsZXRlV2l0aEVycm9yKGNv bnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImKSBmaW5hbCBvdmVycmlkZTsKICAgICB2aXJ0dWFs IHZvaWQgZGlkQmVjb21lRG93bmxvYWQoKSBmaW5hbCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZv aWQgZGlkU2VuZERhdGEodWludDY0X3QgdG90YWxCeXRlc1NlbnQsIHVpbnQ2NF90IHRvdGFsQnl0 ZXNFeHBlY3RlZFRvU2VuZCkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIHdhc0Jsb2NrZWQo KSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgY2Fubm90U2hvd1VSTCgpIG92ZXJyaWRlOwot I2Vsc2UKKyNlbmRpZgogICAgIC8vIFJlc291cmNlSGFuZGxlQ2xpZW50CiAgICAgdmlydHVhbCB2 b2lkIHdpbGxTZW5kUmVxdWVzdEFzeW5jKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlKiwgY29uc3Qg V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25z ZSYgcmVkaXJlY3RSZXNwb25zZSkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGRpZFNlbmRE YXRhKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlKiwgdW5zaWduZWQgbG9uZyBsb25nIGJ5dGVzU2Vu dCwgdW5zaWduZWQgbG9uZyBsb25nIHRvdGFsQnl0ZXNUb0JlU2VudCkgb3ZlcnJpZGU7CkBAIC0x MDgsNyArMTA1LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCB3aWxsQ2FjaGVSZXNwb25z ZUFzeW5jKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlKiwgTlNDYWNoZWRVUkxSZXNwb25zZSAqKSBv dmVycmlkZTsKICNlbmRpZgogI2VuZGlmCi0jZW5kaWYgLy8gVVNFKE5FVFdPUktfU0VTU0lPTikK IAogI2lmIFVTRShQUk9URUNUSU9OX1NQQUNFX0FVVEhfQ0FMTEJBQ0spCiAgICAgdm9pZCBjb250 aW51ZUNhbkF1dGhlbnRpY2F0ZUFnYWluc3RQcm90ZWN0aW9uU3BhY2UoYm9vbCk7CkBAIC0xMzIs OCArMTI4LDggQEAgcHJpdmF0ZToKICAgICBSZWRpcmVjdENvbXBsZXRpb25IYW5kbGVyIG1fcmVk aXJlY3RDb21wbGV0aW9uSGFuZGxlcjsKICNlbHNlCiAgICAgUmVmUHRyPFJlbW90ZU5ldHdvcmtp bmdDb250ZXh0PiBtX25ldHdvcmtpbmdDb250ZXh0OwotICAgIFJlZlB0cjxXZWJDb3JlOjpSZXNv dXJjZUhhbmRsZT4gbV9oYW5kbGU7CiAjZW5kaWYKKyAgICBSZWZQdHI8V2ViQ29yZTo6UmVzb3Vy Y2VIYW5kbGU+IG1faGFuZGxlOwogCiAgICAgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IG1fY3Vy cmVudFJlcXVlc3Q7IC8vIFVwZGF0ZWQgb24gcmVkaXJlY3RzLgogfTsKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Np b25Db2NvYS5tbQkocmV2aXNpb24gMTk2Mzg0KQorKysgU291cmNlL1dlYktpdDIvTmV0d29ya1By b2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMTQy LDcgKzE0Miw3IEBAIC0gKHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICopc2Vzc2kKICAg ICAgICAgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSByZXNvdXJjZVJlc3BvbnNlKHJlc3BvbnNl KTsKICAgICAgICAgY29weVRpbWluZ0RhdGEoW2RhdGFUYXNrIF90aW1pbmdEYXRhXSwgcmVzb3Vy Y2VSZXNwb25zZS5yZXNvdXJjZUxvYWRUaW1pbmcoKSk7CiAgICAgICAgIGF1dG8gY29tcGxldGlv bkhhbmRsZXJDb3B5ID0gQmxvY2tfY29weShjb21wbGV0aW9uSGFuZGxlcik7Ci0gICAgICAgIG5l dHdvcmtEYXRhVGFzay0+Y2xpZW50KCkuZGlkUmVjZWl2ZVJlc3BvbnNlKHJlc291cmNlUmVzcG9u c2UsIFtjb21wbGV0aW9uSGFuZGxlckNvcHldKFdlYkNvcmU6OlBvbGljeUFjdGlvbiBwb2xpY3lB Y3Rpb24pIHsKKyAgICAgICAgbmV0d29ya0RhdGFUYXNrLT5jbGllbnQoKS5kaWRSZWNlaXZlUmVz cG9uc2VOZXR3b3JrU2Vzc2lvbihyZXNvdXJjZVJlc3BvbnNlLCBbY29tcGxldGlvbkhhbmRsZXJD b3B5XShXZWJDb3JlOjpQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uKSB7CiAgICAgICAgICAgICBj b21wbGV0aW9uSGFuZGxlckNvcHkodG9OU1VSTFNlc3Npb25SZXNwb25zZURpc3Bvc2l0aW9uKHBv bGljeUFjdGlvbikpOwogICAgICAgICAgICAgQmxvY2tfcmVsZWFzZShjb21wbGV0aW9uSGFuZGxl ckNvcHkpOwogICAgICAgICB9KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNz L21hYy9OZXR3b3JrTG9hZE1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9tYWMvTmV0d29ya0xvYWRNYWMubW0JKHJldmlzaW9uIDE5NjMyMykKKysrIFNv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL21hYy9OZXR3b3JrTG9hZE1hYy5tbQkod29ya2lu ZyBjb3B5KQpAQCAtNDUsNyArNDUsNyBAQCB2b2lkIE5ldHdvcmtMb2FkOjp3aWxsQ2FjaGVSZXNw b25zZUFzeW5jCiAgICAgbV9oYW5kbGUtPmNvbnRpbnVlV2lsbENhY2hlUmVzcG9uc2UoY2ZSZXNw b25zZSk7CiB9CiAKLSNlbGlmICFVU0UoTkVUV09SS19TRVNTSU9OKQorI2Vsc2UKIAogdm9pZCBO ZXR3b3JrTG9hZDo6d2lsbENhY2hlUmVzcG9uc2VBc3luYyhSZXNvdXJjZUhhbmRsZSogaGFuZGxl LCBOU0NhY2hlZFVSTFJlc3BvbnNlICpuc1Jlc3BvbnNlKQogewo=