190011 2018-09-26 14:39:55 -0700 Fix UAF after r236463 2018-09-26 14:49:40 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 188701 1 achristensen achristensen cdumez webkit-bug-importer youennf oldest_to_newest 1463756 0 achristensen 2018-09-26 14:39:55 -0700 Fix UAF after r236463 1463758 1 350904 achristensen 2018-09-26 14:42:24 -0700 Created attachment 350904 Patch 1463761 2 350906 achristensen 2018-09-26 14:48:00 -0700 Created attachment 350906 Patch 1463762 3 achristensen 2018-09-26 14:48:17 -0700 http://trac.webkit.org/r236523 1463763 4 350904 cdumez 2018-09-26 14:48:43 -0700 Comment on attachment 350904 Patch r=me when the bots are happy (GTK is red) 1463764 5 webkit-bug-importer 2018-09-26 14:49:28 -0700 <rdar://problem/44808982> 350904 2018-09-26 14:42:24 -0700 2018-09-26 14:48:43 -0700 Patch bug-190011-20180926144223.patch text/plain 12185 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzY1MjIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE4LTA5LTI2ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IFVBRiBhZnRl ciByMjM2NDYzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTAwMTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBJIGhhZCByZW1vdmVkIGFuIGVhcmx5IHJldHVybiBpbiBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6 OmNvbnRpbnVlRGlkUmVjZWl2ZVJlc3BvbnNlLgorICAgICAgICBSZWFkaW5nIHRoZSAocHJvYmFi bHkpIG51bGwgbV9yZXNwb25zZUNvbXBsZXRpb25IYW5kbGVyIHdhcyByZWFkaW5nIGFmdGVyIHRo ZSBvYmplY3QgaGFkIGJlZW4gZGVzdHJveWVkLgorICAgICAgICBJIHdlbnQgYWhlYWQgYW5kIGNs ZWFuZWQgdXAgYWxsIHRoZSBsYW1iZGEgY2FwdHVyZXMsIG1ha2luZyBzdXJlIGVhY2ggb25lIGlz IHByb3RlY3RlZCBhY2NvcmRpbmcgdG8gbW9kZXJuIHN0eWxlLgorCisgICAgICAgICogTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0 d29ya1Jlc291cmNlTG9hZGVyOjpzdGFydCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNv dXJjZUxvYWRlcjo6cmV0cmlldmVDYWNoZUVudHJ5KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29y a1Jlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlUmVzcG9uc2UpOgorICAgICAgICAoV2ViS2l0OjpO ZXR3b3JrUmVzb3VyY2VMb2FkZXI6OndpbGxTZW5kUmVkaXJlY3RlZFJlcXVlc3QpOgorICAgICAg ICAoV2ViS2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmNvbnRpbnVlRGlkUmVjZWl2ZVJlc3Bv bnNlKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjp0cnlTdG9yZUFz Q2FjaGVFbnRyeSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6Y29u dGludWVQcm9jZXNzaW5nQ2FjaGVkRW50cnlBZnRlckRpZFJlY2VpdmVSZXNwb25zZSk6CisKIDIw MTgtMDktMjYgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgU2Vs ZWN0aW9uIHNob3VsZCB3b3JrIGFjcm9zcyBzaGFkb3cgYm91bmRhcnkgd2hlbiBpbml0aWF0ZWQg YnkgYSBtb3VzZSBkcmFnCkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdv cmtSZXNvdXJjZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCShyZXZpc2lvbiAyMzY0ODgpCisrKyBT b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTE4NSw3ICsxODUsNyBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRl cjo6c3RhcnQoKQogICAgIG1fd2FzU3RhcnRlZCA9IHRydWU7CiAKICAgICBpZiAobV9uZXR3b3Jr TG9hZENoZWNrZXIpIHsKLSAgICAgICAgbV9uZXR3b3JrTG9hZENoZWNrZXItPmNoZWNrKFJlc291 cmNlUmVxdWVzdCB7IG9yaWdpbmFsUmVxdWVzdCgpIH0sIHRoaXMsIFt0aGlzXSAoYXV0byYmIHJl c3VsdCkgeworICAgICAgICBtX25ldHdvcmtMb2FkQ2hlY2tlci0+Y2hlY2soUmVzb3VyY2VSZXF1 ZXN0IHsgb3JpZ2luYWxSZXF1ZXN0KCkgfSwgdGhpcywgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBt YWtlUmVmKCp0aGlzKV0gKGF1dG8mJiByZXN1bHQpIHsKICAgICAgICAgICAgIGlmICghcmVzdWx0 Lmhhc192YWx1ZSgpKSB7CiAgICAgICAgICAgICAgICAgaWYgKCFyZXN1bHQuZXJyb3IoKS5pc0Nh bmNlbGxhdGlvbigpKQogICAgICAgICAgICAgICAgICAgICB0aGlzLT5kaWRGYWlsTG9hZGluZyhy ZXN1bHQuZXJyb3IoKSk7CkBAIC0yMTUsMzcgKzIxNSwzNiBAQCB2b2lkIE5ldHdvcmtSZXNvdXJj ZUxvYWRlcjo6cmV0cmlldmVDYWNoCiB7CiAgICAgQVNTRVJUKGNhblVzZUNhY2hlKHJlcXVlc3Qp KTsKIAotICAgIFJlZlB0cjxOZXR3b3JrUmVzb3VyY2VMb2FkZXI+IGxvYWRlcih0aGlzKTsKLSAg ICBtX2NhY2hlLT5yZXRyaWV2ZShyZXF1ZXN0LCB7IG1fcGFyYW1ldGVycy53ZWJQYWdlSUQsIG1f cGFyYW1ldGVycy53ZWJGcmFtZUlEIH0sIHNlc3Npb25JRCgpLCBbdGhpcywgbG9hZGVyID0gV1RG TW92ZShsb2FkZXIpLCByZXF1ZXN0ID0gUmVzb3VyY2VSZXF1ZXN0IHsgcmVxdWVzdCB9XShhdXRv IGVudHJ5LCBhdXRvIGluZm8pIG11dGFibGUgewotICAgICAgICBpZiAobG9hZGVyLT5oYXNPbmVS ZWYoKSkgeworICAgIG1fY2FjaGUtPnJldHJpZXZlKHJlcXVlc3QsIHsgbV9wYXJhbWV0ZXJzLndl YlBhZ2VJRCwgbV9wYXJhbWV0ZXJzLndlYkZyYW1lSUQgfSwgc2Vzc2lvbklEKCksIFt0aGlzLCBw cm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIHJlcXVlc3QgPSBSZXNvdXJjZVJlcXVlc3Qg eyByZXF1ZXN0IH1dKGF1dG8gZW50cnksIGF1dG8gaW5mbykgbXV0YWJsZSB7CisgICAgICAgIGlm IChoYXNPbmVSZWYoKSkgewogICAgICAgICAgICAgLy8gVGhlIGxvYWRlciBoYXMgYmVlbiBhYm9y dGVkIGFuZCBpcyBvbmx5IGhlbGQgYWxpdmUgYnkgdGhpcyBsYW1iZGEuCiAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBsb2FkZXItPmxvZ1Nsb3dDYWNoZVJldHJpZXZl SWZOZWVkZWQoaW5mbyk7CisgICAgICAgIGxvZ1Nsb3dDYWNoZVJldHJpZXZlSWZOZWVkZWQoaW5m byk7CiAKICAgICAgICAgaWYgKCFlbnRyeSkgewogICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZf QUxMT1dFRCgicmV0cmlldmVDYWNoZUVudHJ5OiBSZXNvdXJjZSBub3QgaW4gY2FjaGUgKHBhZ2VJ RCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQ Ukl1NjQgIiwgaXNNYWluUmVzb3VyY2UgPSAlZCwgaXNTeW5jaHJvbm91cyA9ICVkKSIsIG1fcGFy YW1ldGVycy53ZWJQYWdlSUQsIG1fcGFyYW1ldGVycy53ZWJGcmFtZUlELCBtX3BhcmFtZXRlcnMu aWRlbnRpZmllciwgaXNNYWluUmVzb3VyY2UoKSwgaXNTeW5jaHJvbm91cygpKTsKLSAgICAgICAg ICAgIGxvYWRlci0+c3RhcnROZXR3b3JrTG9hZChXVEZNb3ZlKHJlcXVlc3QpLCBGaXJzdExvYWQ6 Olllcyk7CisgICAgICAgICAgICBzdGFydE5ldHdvcmtMb2FkKFdURk1vdmUocmVxdWVzdCksIEZp cnN0TG9hZDo6WWVzKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAgICBp ZiAoZW50cnktPnJlZGlyZWN0UmVxdWVzdCgpKSB7CiAgICAgICAgICAgICBSRUxFQVNFX0xPR19J Rl9BTExPV0VEKCJyZXRyaWV2ZUNhY2hlRW50cnk6IEhhbmRsaW5nIHJlZGlyZWN0IChwYWdlSUQg PSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJ dTY0ICIsIGlzTWFpblJlc291cmNlID0gJWQsIGlzU3luY2hyb25vdXMgPSAlZCkiLCBtX3BhcmFt ZXRlcnMud2ViUGFnZUlELCBtX3BhcmFtZXRlcnMud2ViRnJhbWVJRCwgbV9wYXJhbWV0ZXJzLmlk ZW50aWZpZXIsIGlzTWFpblJlc291cmNlKCksIGlzU3luY2hyb25vdXMoKSk7Ci0gICAgICAgICAg ICBsb2FkZXItPmRpc3BhdGNoV2lsbFNlbmRSZXF1ZXN0Rm9yQ2FjaGVFbnRyeShXVEZNb3ZlKHJl cXVlc3QpLCBXVEZNb3ZlKGVudHJ5KSk7CisgICAgICAgICAgICBkaXNwYXRjaFdpbGxTZW5kUmVx dWVzdEZvckNhY2hlRW50cnkoV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShlbnRyeSkpOwogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgICAgIGlmIChsb2FkZXItPm1fcGFyYW1l dGVycy5uZWVkc0NlcnRpZmljYXRlSW5mbyAmJiAhZW50cnktPnJlc3BvbnNlKCkuY2VydGlmaWNh dGVJbmZvKCkpIHsKKyAgICAgICAgaWYgKG1fcGFyYW1ldGVycy5uZWVkc0NlcnRpZmljYXRlSW5m byAmJiAhZW50cnktPnJlc3BvbnNlKCkuY2VydGlmaWNhdGVJbmZvKCkpIHsKICAgICAgICAgICAg IFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInJldHJpZXZlQ2FjaGVFbnRyeTogUmVzb3VyY2UgZG9l cyBub3QgaGF2ZSByZXF1aXJlZCBjZXJ0aWZpY2F0ZSAocGFnZUlEID0gJSIgUFJJdTY0ICIsIGZy YW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiLCBpc01haW5SZXNv dXJjZSA9ICVkLCBpc1N5bmNocm9ub3VzID0gJWQpIiwgbV9wYXJhbWV0ZXJzLndlYlBhZ2VJRCwg bV9wYXJhbWV0ZXJzLndlYkZyYW1lSUQsIG1fcGFyYW1ldGVycy5pZGVudGlmaWVyLCBpc01haW5S ZXNvdXJjZSgpLCBpc1N5bmNocm9ub3VzKCkpOwotICAgICAgICAgICAgbG9hZGVyLT5zdGFydE5l dHdvcmtMb2FkKFdURk1vdmUocmVxdWVzdCksIEZpcnN0TG9hZDo6WWVzKTsKKyAgICAgICAgICAg IHN0YXJ0TmV0d29ya0xvYWQoV1RGTW92ZShyZXF1ZXN0KSwgRmlyc3RMb2FkOjpZZXMpOwogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIGlmIChlbnRyeS0+bmVlZHNWYWxp ZGF0aW9uKCkgfHwgcmVxdWVzdC5jYWNoZVBvbGljeSgpID09IFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdENhY2hlUG9saWN5OjpSZWZyZXNoQW55Q2FjaGVEYXRhKSB7CiAgICAgICAgICAgICBSRUxF QVNFX0xPR19JRl9BTExPV0VEKCJyZXRyaWV2ZUNhY2hlRW50cnk6IFZhbGlkYXRpbmcgY2FjaGUg ZW50cnkgKHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJlc291 cmNlSUQgPSAlIiBQUkl1NjQgIiwgaXNNYWluUmVzb3VyY2UgPSAlZCwgaXNTeW5jaHJvbm91cyA9 ICVkKSIsIG1fcGFyYW1ldGVycy53ZWJQYWdlSUQsIG1fcGFyYW1ldGVycy53ZWJGcmFtZUlELCBt X3BhcmFtZXRlcnMuaWRlbnRpZmllciwgaXNNYWluUmVzb3VyY2UoKSwgaXNTeW5jaHJvbm91cygp KTsKLSAgICAgICAgICAgIGxvYWRlci0+dmFsaWRhdGVDYWNoZUVudHJ5KFdURk1vdmUoZW50cnkp KTsKKyAgICAgICAgICAgIHZhbGlkYXRlQ2FjaGVFbnRyeShXVEZNb3ZlKGVudHJ5KSk7CiAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RCgicmV0cmlldmVDYWNoZUVudHJ5OiBSZXRyaWV2ZWQgcmVzb3VyY2UgZnJvbSBjYWNoZSAocGFn ZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUi IFBSSXU2NCAiLCBpc01haW5SZXNvdXJjZSA9ICVkLCBpc1N5bmNocm9ub3VzID0gJWQpIiwgbV9w YXJhbWV0ZXJzLndlYlBhZ2VJRCwgbV9wYXJhbWV0ZXJzLndlYkZyYW1lSUQsIG1fcGFyYW1ldGVy cy5pZGVudGlmaWVyLCBpc01haW5SZXNvdXJjZSgpLCBpc1N5bmNocm9ub3VzKCkpOwotICAgICAg ICBsb2FkZXItPmRpZFJldHJpZXZlQ2FjaGVFbnRyeShXVEZNb3ZlKGVudHJ5KSk7CisgICAgICAg IGRpZFJldHJpZXZlQ2FjaGVFbnRyeShXVEZNb3ZlKGVudHJ5KSk7CiAgICAgfSk7CiB9CiAKQEAg LTQ2OSw5ICs0NjgsOSBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJl CiAgICAgaWYgKG1fbmV0d29ya0xvYWRDaGVja2VyKSB7CiAgICAgICAgIGF1dG8gZXJyb3IgPSBt X25ldHdvcmtMb2FkQ2hlY2tlci0+dmFsaWRhdGVSZXNwb25zZShtX3Jlc3BvbnNlKTsKICAgICAg ICAgaWYgKCFlcnJvci5pc051bGwoKSkgewotICAgICAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRp c3BhdGNoKFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGVycm9yID0gV1RGTW92ZShl cnJvcildIHsKLSAgICAgICAgICAgICAgICBpZiAocHJvdGVjdGVkVGhpcy0+bV9uZXR3b3JrTG9h ZCkKLSAgICAgICAgICAgICAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlkRmFpbExvYWRpbmcoZXJy b3IpOworICAgICAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0 ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGVycm9yID0gV1RGTW92ZShlcnJvcildIHsKKyAgICAg ICAgICAgICAgICBpZiAobV9uZXR3b3JrTG9hZCkKKyAgICAgICAgICAgICAgICAgICAgZGlkRmFp bExvYWRpbmcoZXJyb3IpOwogICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICByZXR1cm4gY29t cGxldGlvbkhhbmRsZXIoUG9saWN5QWN0aW9uOjpJZ25vcmUpOwogICAgICAgICB9CkBAIC01OTIs MzUgKzU5MSwzNSBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRSZWRpCiAK ICAgICBpZiAobV9uZXR3b3JrTG9hZENoZWNrZXIpIHsKICAgICAgICAgbV9uZXR3b3JrTG9hZENo ZWNrZXItPnN0b3JlUmVkaXJlY3Rpb25JZk5lZWRlZChyZXF1ZXN0LCByZWRpcmVjdFJlc3BvbnNl KTsKLSAgICAgICAgbV9uZXR3b3JrTG9hZENoZWNrZXItPmNoZWNrUmVkaXJlY3Rpb24oV1RGTW92 ZShyZXF1ZXN0KSwgV1RGTW92ZShyZWRpcmVjdFJlcXVlc3QpLCBXVEZNb3ZlKHJlZGlyZWN0UmVz cG9uc2UpLCB0aGlzLCBbcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCB0aGlzLCBzdG9y ZWRDcmVkZW50aWFsc1BvbGljeSA9IG1fbmV0d29ya0xvYWRDaGVja2VyLT5zdG9yZWRDcmVkZW50 aWFsc1BvbGljeSgpXShhdXRvJiYgcmVzdWx0KSBtdXRhYmxlIHsKKyAgICAgICAgbV9uZXR3b3Jr TG9hZENoZWNrZXItPmNoZWNrUmVkaXJlY3Rpb24oV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShy ZWRpcmVjdFJlcXVlc3QpLCBXVEZNb3ZlKHJlZGlyZWN0UmVzcG9uc2UpLCB0aGlzLCBbdGhpcywg cHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBzdG9yZWRDcmVkZW50aWFsc1BvbGljeSA9 IG1fbmV0d29ya0xvYWRDaGVja2VyLT5zdG9yZWRDcmVkZW50aWFsc1BvbGljeSgpXShhdXRvJiYg cmVzdWx0KSBtdXRhYmxlIHsKICAgICAgICAgICAgIGlmICghcmVzdWx0Lmhhc192YWx1ZSgpKSB7 CiAgICAgICAgICAgICAgICAgaWYgKHJlc3VsdC5lcnJvcigpLmlzQ2FuY2VsbGF0aW9uKCkpCiAg ICAgICAgICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICAgICAgICAgIHRoaXMtPmRpZEZh aWxMb2FkaW5nKHJlc3VsdC5lcnJvcigpKTsKKyAgICAgICAgICAgICAgICBkaWRGYWlsTG9hZGlu ZyhyZXN1bHQuZXJyb3IoKSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAg fQogCiAgICAgICAgICAgICBpZiAobV9wYXJhbWV0ZXJzLm9wdGlvbnMucmVkaXJlY3QgPT0gRmV0 Y2hPcHRpb25zOjpSZWRpcmVjdDo6TWFudWFsKSB7Ci0gICAgICAgICAgICAgICAgdGhpcy0+ZGlk RmluaXNoV2l0aFJlZGlyZWN0UmVzcG9uc2UoV1RGTW92ZShyZXN1bHQtPnJlZGlyZWN0UmVzcG9u c2UpKTsKKyAgICAgICAgICAgICAgICBkaWRGaW5pc2hXaXRoUmVkaXJlY3RSZXNwb25zZShXVEZN b3ZlKHJlc3VsdC0+cmVkaXJlY3RSZXNwb25zZSkpOwogICAgICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgaWYgKHRoaXMtPmlzU3luY2hyb25vdXMoKSkg eworICAgICAgICAgICAgaWYgKGlzU3luY2hyb25vdXMoKSkgewogICAgICAgICAgICAgICAgIGlm IChzdG9yZWRDcmVkZW50aWFsc1BvbGljeSAhPSBtX25ldHdvcmtMb2FkQ2hlY2tlci0+c3RvcmVk Q3JlZGVudGlhbHNQb2xpY3koKSkgewogICAgICAgICAgICAgICAgICAgICAvLyBXZSBuZWVkIHRv IHJlc3RhcnQgdGhlIGxvYWQgdG8gdXBkYXRlIHRoZSBzZXNzaW9uIGFjY29yZGluZyB0aGUgbmV3 IGNyZWRlbnRpYWwgcG9saWN5LgotICAgICAgICAgICAgICAgICAgICB0aGlzLT5yZXN0YXJ0TmV0 d29ya0xvYWQoV1RGTW92ZShyZXN1bHQtPnJlZGlyZWN0UmVxdWVzdCkpOworICAgICAgICAgICAg ICAgICAgICByZXN0YXJ0TmV0d29ya0xvYWQoV1RGTW92ZShyZXN1bHQtPnJlZGlyZWN0UmVxdWVz dCkpOwogICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICAgICAgfQogCiAg ICAgICAgICAgICAgICAgLy8gV2UgZG8gbm90IHN1cHBvcnQgcHJvbXB0aW5nIGZvciBjcmVkZW50 aWFscyBmb3Igc3luY2hyb25vdXMgbG9hZHMuIElmIHdlIGV2ZXIgY2hhbmdlIHRoaXMgcG9saWN5 IHRoZW4KICAgICAgICAgICAgICAgICAvLyB3ZSBuZWVkIHRvIHRha2UgY2FyZSB0byBwcm9tcHQg aWYgYW5kIG9ubHkgaWYgcmVxdWVzdCBhbmQgcmVkaXJlY3RSZXF1ZXN0IGFyZSBub3QgbWl4ZWQg Y29udGVudC4KLSAgICAgICAgICAgICAgICB0aGlzLT5jb250aW51ZVdpbGxTZW5kUmVxdWVzdChX VEZNb3ZlKHJlc3VsdC0+cmVkaXJlY3RSZXF1ZXN0KSwgZmFsc2UpOworICAgICAgICAgICAgICAg IGNvbnRpbnVlV2lsbFNlbmRSZXF1ZXN0KFdURk1vdmUocmVzdWx0LT5yZWRpcmVjdFJlcXVlc3Qp LCBmYWxzZSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogCiAgICAg ICAgICAgICBtX3Nob3VsZFJlc3RhcnRMb2FkID0gc3RvcmVkQ3JlZGVudGlhbHNQb2xpY3kgIT0g bV9uZXR3b3JrTG9hZENoZWNrZXItPnN0b3JlZENyZWRlbnRpYWxzUG9saWN5KCk7Ci0gICAgICAg ICAgICB0aGlzLT5jb250aW51ZVdpbGxTZW5kUmVkaXJlY3RlZFJlcXVlc3QoV1RGTW92ZShyZXN1 bHQtPnJlcXVlc3QpLCBXVEZNb3ZlKHJlc3VsdC0+cmVkaXJlY3RSZXF1ZXN0KSwgV1RGTW92ZShy ZXN1bHQtPnJlZGlyZWN0UmVzcG9uc2UpKTsKKyAgICAgICAgICAgIGNvbnRpbnVlV2lsbFNlbmRS ZWRpcmVjdGVkUmVxdWVzdChXVEZNb3ZlKHJlc3VsdC0+cmVxdWVzdCksIFdURk1vdmUocmVzdWx0 LT5yZWRpcmVjdFJlcXVlc3QpLCBXVEZNb3ZlKHJlc3VsdC0+cmVkaXJlY3RSZXNwb25zZSkpOwog ICAgICAgICB9KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTcxMiw4ICs3MTEsMTAgQEAg dm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmNvbnRpbnVlV2lsbAogCiB2b2lkIE5ldHdvcmtS ZXNvdXJjZUxvYWRlcjo6Y29udGludWVEaWRSZWNlaXZlUmVzcG9uc2UoKQogewotICAgIGlmICht X2NhY2hlRW50cnlXYWl0aW5nRm9yQ29udGludWVEaWRSZWNlaXZlUmVzcG9uc2UpCisgICAgaWYg KG1fY2FjaGVFbnRyeVdhaXRpbmdGb3JDb250aW51ZURpZFJlY2VpdmVSZXNwb25zZSkgewogICAg ICAgICBjb250aW51ZVByb2Nlc3NpbmdDYWNoZWRFbnRyeUFmdGVyRGlkUmVjZWl2ZVJlc3BvbnNl KFdURk1vdmUobV9jYWNoZUVudHJ5V2FpdGluZ0ZvckNvbnRpbnVlRGlkUmVjZWl2ZVJlc3BvbnNl KSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CiAKICAgICBpZiAobV9yZXNwb25zZUNvbXBsZXRp b25IYW5kbGVyKQogICAgICAgICBtX3Jlc3BvbnNlQ29tcGxldGlvbkhhbmRsZXIoUG9saWN5QWN0 aW9uOjpVc2UpOwpAQCAtNzYyLDEyICs3NjMsMTIgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2Fk ZXI6OnRyeVN0b3JlQXNDYQogICAgIGlmICghbV9idWZmZXJlZERhdGFGb3JDYWNoZSkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgbV9jYWNoZS0+c3RvcmUobV9uZXR3b3JrTG9hZC0+Y3VycmVudFJl cXVlc3QoKSwgbV9yZXNwb25zZSwgV1RGTW92ZShtX2J1ZmZlcmVkRGF0YUZvckNhY2hlKSwgW2xv YWRlciA9IG1ha2VSZWYoKnRoaXMpXShhdXRvJiBtYXBwZWRCb2R5KSBtdXRhYmxlIHsKKyAgICBt X2NhY2hlLT5zdG9yZShtX25ldHdvcmtMb2FkLT5jdXJyZW50UmVxdWVzdCgpLCBtX3Jlc3BvbnNl LCBXVEZNb3ZlKG1fYnVmZmVyZWREYXRhRm9yQ2FjaGUpLCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9 IG1ha2VSZWYoKnRoaXMpXShhdXRvJiBtYXBwZWRCb2R5KSBtdXRhYmxlIHsKICNpZiBFTkFCTEUo U0hBUkVBQkxFX1JFU09VUkNFKQogICAgICAgICBpZiAobWFwcGVkQm9keS5zaGFyZWFibGVSZXNv dXJjZUhhbmRsZS5pc051bGwoKSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgTE9HKE5l dHdvcmtDYWNoZSwgIihOZXR3b3JrUHJvY2Vzcykgc2VuZGluZyBEaWRDYWNoZVJlc291cmNlIik7 Ci0gICAgICAgIGxvYWRlci0+c2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9u OjpEaWRDYWNoZVJlc291cmNlKGxvYWRlci0+b3JpZ2luYWxSZXF1ZXN0KCksIG1hcHBlZEJvZHku c2hhcmVhYmxlUmVzb3VyY2VIYW5kbGUsIGxvYWRlci0+c2Vzc2lvbklEKCkpKTsKKyAgICAgICAg c2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uOjpEaWRDYWNoZVJlc291cmNl KG9yaWdpbmFsUmVxdWVzdCgpLCBtYXBwZWRCb2R5LnNoYXJlYWJsZVJlc291cmNlSGFuZGxlLCBz ZXNzaW9uSUQoKSkpOwogI2VuZGlmCiAgICAgfSk7CiB9CkBAIC04MTQsMTkgKzgxNSwxOSBAQCB2 b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6Y29udGludWVQcm9jCiAKICAgICAgICAgZm9yIChh dXRvJiB0eXBlIDogbV9wYXJhbWV0ZXJzLmRlcml2ZWRDYWNoZWREYXRhVHlwZXNUb1JldHJpZXZl KSB7CiAgICAgICAgICAgICBOZXR3b3JrQ2FjaGU6OkRhdGFLZXkga2V5IHsgb3JpZ2luYWxSZXF1 ZXN0KCkuY2FjaGVQYXJ0aXRpb24oKSwgdHlwZSwgYm9keUhhc2ggfTsKLSAgICAgICAgICAgIG1f Y2FjaGUtPnJldHJpZXZlRGF0YShrZXksIFtsb2FkZXIgPSBtYWtlUmVmKCp0aGlzKSwgZW50cnlQ dHIsIHR5cGUsIHJldHJpZXZlQ291bnRdIChjb25zdCB1aW50OF90KiBkYXRhLCBzaXplX3Qgc2l6 ZSkgbXV0YWJsZSB7Ci0gICAgICAgICAgICAgICAgbG9hZGVyLT5tX3JldHJpZXZlZERlcml2ZWRE YXRhQ291bnQrKzsKLSAgICAgICAgICAgICAgICBib29sIHJldHJpZXZlZEFsbCA9IGxvYWRlci0+ bV9yZXRyaWV2ZWREZXJpdmVkRGF0YUNvdW50ID09IHJldHJpZXZlQ291bnQ7CisgICAgICAgICAg ICBtX2NhY2hlLT5yZXRyaWV2ZURhdGEoa2V5LCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VS ZWYoKnRoaXMpLCBlbnRyeVB0ciwgdHlwZSwgcmV0cmlldmVDb3VudF0gKGNvbnN0IHVpbnQ4X3Qq IGRhdGEsIHNpemVfdCBzaXplKSBtdXRhYmxlIHsKKyAgICAgICAgICAgICAgICBtX3JldHJpZXZl ZERlcml2ZWREYXRhQ291bnQrKzsKKyAgICAgICAgICAgICAgICBib29sIHJldHJpZXZlZEFsbCA9 IG1fcmV0cmlldmVkRGVyaXZlZERhdGFDb3VudCA9PSByZXRyaWV2ZUNvdW50OwogICAgICAgICAg ICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxOZXR3b3JrQ2FjaGU6OkVudHJ5PiBlbnRyeShyZXRyaWV2 ZWRBbGwgPyBlbnRyeVB0ciA6IG51bGxwdHIpOwotICAgICAgICAgICAgICAgIGlmIChsb2FkZXIt Pmhhc09uZVJlZigpKQorICAgICAgICAgICAgICAgIGlmIChoYXNPbmVSZWYoKSkKICAgICAgICAg ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIGlmIChkYXRhKSB7CiAgICAgICAg ICAgICAgICAgICAgIElQQzo6RGF0YVJlZmVyZW5jZSBkYXRhUmVmZXJlbmNlKGRhdGEsIHNpemUp OwotICAgICAgICAgICAgICAgICAgICBsb2FkZXItPnNlbmQoTWVzc2FnZXM6OldlYlJlc291cmNl TG9hZGVyOjpEaWRSZXRyaWV2ZURlcml2ZWREYXRhKHR5cGUsIGRhdGFSZWZlcmVuY2UpKTsKKyAg ICAgICAgICAgICAgICAgICAgc2VuZChNZXNzYWdlczo6V2ViUmVzb3VyY2VMb2FkZXI6OkRpZFJl dHJpZXZlRGVyaXZlZERhdGEodHlwZSwgZGF0YVJlZmVyZW5jZSkpOwogICAgICAgICAgICAgICAg IH0KICAgICAgICAgICAgICAgICBpZiAocmV0cmlldmVkQWxsKSB7Ci0gICAgICAgICAgICAgICAg ICAgIGxvYWRlci0+c2VuZFJlc3VsdEZvckNhY2hlRW50cnkoV1RGTW92ZShlbnRyeSkpOwotICAg ICAgICAgICAgICAgICAgICBsb2FkZXItPmNsZWFudXAoTG9hZFJlc3VsdDo6U3VjY2Vzcyk7Cisg ICAgICAgICAgICAgICAgICAgIHNlbmRSZXN1bHRGb3JDYWNoZUVudHJ5KFdURk1vdmUoZW50cnkp KTsKKyAgICAgICAgICAgICAgICAgICAgY2xlYW51cChMb2FkUmVzdWx0OjpTdWNjZXNzKTsKICAg ICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfQo= 350906 2018-09-26 14:48:00 -0700 2018-09-26 14:48:24 -0700 Patch bug-190011-20180926144759.patch text/plain 1625 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzY1MjIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE4LTA5LTI2ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IFVBRiBhZnRl ciByMjM2NDYzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTAwMTEKKworICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KKworICAgICAgICBJ IGhhZCByZW1vdmVkIGFuIGVhcmx5IHJldHVybiBpbiBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmNv bnRpbnVlRGlkUmVjZWl2ZVJlc3BvbnNlLgorICAgICAgICBSZWFkaW5nIHRoZSAocHJvYmFibHkp IG51bGwgbV9yZXNwb25zZUNvbXBsZXRpb25IYW5kbGVyIHdhcyByZWFkaW5nIGFmdGVyIHRoZSBv YmplY3QgaGFkIGJlZW4gZGVzdHJveWVkLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0 d29ya1Jlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNl TG9hZGVyOjpjb250aW51ZURpZFJlY2VpdmVSZXNwb25zZSk6CisKIDIwMTgtMDktMjYgIFJ5b3N1 a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgU2VsZWN0aW9uIHNob3VsZCB3 b3JrIGFjcm9zcyBzaGFkb3cgYm91bmRhcnkgd2hlbiBpbml0aWF0ZWQgYnkgYSBtb3VzZSBkcmFn CkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRl ci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr UmVzb3VyY2VMb2FkZXIuY3BwCShyZXZpc2lvbiAyMzY0ODgpCisrKyBTb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTcxMiw4ICs3MTIsMTAgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmNvbnRpbnVlV2ls bAogCiB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6Y29udGludWVEaWRSZWNlaXZlUmVzcG9u c2UoKQogewotICAgIGlmIChtX2NhY2hlRW50cnlXYWl0aW5nRm9yQ29udGludWVEaWRSZWNlaXZl UmVzcG9uc2UpCisgICAgaWYgKG1fY2FjaGVFbnRyeVdhaXRpbmdGb3JDb250aW51ZURpZFJlY2Vp dmVSZXNwb25zZSkgewogICAgICAgICBjb250aW51ZVByb2Nlc3NpbmdDYWNoZWRFbnRyeUFmdGVy RGlkUmVjZWl2ZVJlc3BvbnNlKFdURk1vdmUobV9jYWNoZUVudHJ5V2FpdGluZ0ZvckNvbnRpbnVl RGlkUmVjZWl2ZVJlc3BvbnNlKSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CiAKICAgICBpZiAo bV9yZXNwb25zZUNvbXBsZXRpb25IYW5kbGVyKQogICAgICAgICBtX3Jlc3BvbnNlQ29tcGxldGlv bkhhbmRsZXIoUG9saWN5QWN0aW9uOjpVc2UpOwo=