208522 2020-03-03 10:41:05 -0800 Expose originalURL on _WKResourceLoadInfo 2020-03-03 15:07:18 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen bweinstein webkit-bug-importer oldest_to_newest 1625123 0 achristensen 2020-03-03 10:41:05 -0800 Expose originalURL on _WKResourceLoadInfo 1625126 1 392297 achristensen 2020-03-03 10:50:50 -0800 Created attachment 392297 Patch 1625234 2 392327 achristensen 2020-03-03 14:09:20 -0800 Created attachment 392327 Patch 1625254 3 392330 achristensen 2020-03-03 14:24:53 -0800 Created attachment 392330 Patch 1625272 4 achristensen 2020-03-03 15:06:34 -0800 http://trac.webkit.org/r257806 1625273 5 webkit-bug-importer 2020-03-03 15:07:18 -0800 <rdar://problem/60015090> 392297 2020-03-03 10:50:50 -0800 2020-03-03 14:09:18 -0800 Patch bug-208522-20200303105049.patch text/plain 9585 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTc3MjEpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDIwLTAzLTAzICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRXhwb3NlIG9yaWdp bmFsVVJMIGFuZCBvcmlnaW5hbEhUVFBNZXRob2Qgb24gX1dLUmVzb3VyY2VMb2FkSW5mbworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4NTIyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ292ZXJlZCBieSBB UEkgdGVzdHMuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2Fk ZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnJlc291cmNl TG9hZEluZm8pOgorICAgICAgICAqIFNoYXJlZC9SZXNvdXJjZUxvYWRJbmZvLmg6CisgICAgICAg IChXZWJLaXQ6OlJlc291cmNlTG9hZEluZm86OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJL aXQ6OlJlc291cmNlTG9hZEluZm86OmRlY29kZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9B UElSZXNvdXJjZUxvYWRJbmZvLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tS ZXNvdXJjZUxvYWRJbmZvLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tSZXNv dXJjZUxvYWRJbmZvLm1tOgorICAgICAgICAoLVtfV0tSZXNvdXJjZUxvYWRJbmZvIG9yaWdpbmFs VVJMXSk6CisgICAgICAgICgtW19XS1Jlc291cmNlTG9hZEluZm8gaW5pdFdpdGhDb2RlcjpdKToK KyAgICAgICAgKC1bX1dLUmVzb3VyY2VMb2FkSW5mbyBlbmNvZGVXaXRoQ29kZXI6XSk6CisKIDIw MjAtMDMtMDIgIEphY29iIFVwaG9mZiAgPGphY29iX3VwaG9mZkBhcHBsZS5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjI1NzY4Ny4KSW5kZXg6IFNvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAJKHJl dmlzaW9uIDI1NzcyMSkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jl c291cmNlTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzM5LDYgKzMzOSw4IEBAIFJlc291 cmNlTG9hZEluZm8gTmV0d29ya1Jlc291cmNlTG9hZGVyOjoKICAgICAgICAgbV9yZXNvdXJjZUxv YWRJRCwKICAgICAgICAgbV9wYXJhbWV0ZXJzLndlYkZyYW1lSUQsCiAgICAgICAgIG1fcGFyYW1l dGVycy5wYXJlbnRGcmFtZUlELAorICAgICAgICBvcmlnaW5hbFJlcXVlc3QoKS51cmwoKSwKKyAg ICAgICAgb3JpZ2luYWxSZXF1ZXN0KCkuaHR0cE1ldGhvZCgpCiAgICAgfTsKIH0KIApJbmRleDog U291cmNlL1dlYktpdC9TaGFyZWQvUmVzb3VyY2VMb2FkSW5mby5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvU2hhcmVkL1Jlc291cmNlTG9hZEluZm8uaAkocmV2aXNpb24gMjU3NzIxKQor KysgU291cmNlL1dlYktpdC9TaGFyZWQvUmVzb3VyY2VMb2FkSW5mby5oCSh3b3JraW5nIGNvcHkp CkBAIC0zNiwxMiArMzYsMTYgQEAgc3RydWN0IFJlc291cmNlTG9hZEluZm8gewogICAgIE5ldHdv cmtSZXNvdXJjZUxvYWRJZGVudGlmaWVyIHJlc291cmNlTG9hZElEOwogICAgIE9wdGlvbmFsPFdl YkNvcmU6OkZyYW1lSWRlbnRpZmllcj4gZnJhbWVJRDsKICAgICBPcHRpb25hbDxXZWJDb3JlOjpG cmFtZUlkZW50aWZpZXI+IHBhcmVudEZyYW1lSUQ7CisgICAgVVJMIG9yaWdpbmFsVVJMOworICAg IFN0cmluZyBvcmlnaW5hbEhUVFBNZXRob2Q7CiAgICAgCiAgICAgdm9pZCBlbmNvZGUoSVBDOjpF bmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIHsKICAgICAgICAgZW5jb2RlciA8PCByZXNvdXJj ZUxvYWRJRDsKICAgICAgICAgZW5jb2RlciA8PCBmcmFtZUlEOwogICAgICAgICBlbmNvZGVyIDw8 IHBhcmVudEZyYW1lSUQ7CisgICAgICAgIGVuY29kZXIgPDwgb3JpZ2luYWxVUkw7CisgICAgICAg IGVuY29kZXIgPDwgb3JpZ2luYWxIVFRQTWV0aG9kOwogICAgIH0KIAogICAgIHN0YXRpYyBPcHRp b25hbDxSZXNvdXJjZUxvYWRJbmZvPiBkZWNvZGUoSVBDOjpEZWNvZGVyJiBkZWNvZGVyKQpAQCAt NjEsMTAgKzY1LDIyIEBAIHN0cnVjdCBSZXNvdXJjZUxvYWRJbmZvIHsKICAgICAgICAgaWYgKCFw YXJlbnRGcmFtZUlEKQogICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAorICAgICAg ICBPcHRpb25hbDxVUkw+IG9yaWdpbmFsVVJMOworICAgICAgICBkZWNvZGVyID4+IG9yaWdpbmFs VVJMOworICAgICAgICBpZiAoIW9yaWdpbmFsVVJMKQorICAgICAgICAgICAgcmV0dXJuIFdURjo6 bnVsbG9wdDsKKworICAgICAgICBPcHRpb25hbDxTdHJpbmc+IG9yaWdpbmFsSFRUUE1ldGhvZDsK KyAgICAgICAgZGVjb2RlciA+PiBvcmlnaW5hbEhUVFBNZXRob2Q7CisgICAgICAgIGlmICghb3Jp Z2luYWxIVFRQTWV0aG9kKQorICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKKwogICAg ICAgICByZXR1cm4ge3sKICAgICAgICAgICAgIFdURk1vdmUoKnJlc291cmNlTG9hZElEKSwKICAg ICAgICAgICAgIFdURk1vdmUoKmZyYW1lSUQpLAogICAgICAgICAgICAgV1RGTW92ZSgqcGFyZW50 RnJhbWVJRCksCisgICAgICAgICAgICBXVEZNb3ZlKCpvcmlnaW5hbFVSTCksCisgICAgICAgICAg ICBXVEZNb3ZlKCpvcmlnaW5hbEhUVFBNZXRob2QpCiAgICAgICAgIH19OwogICAgIH0KIH07Cklu ZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUmVzb3VyY2VMb2FkSW5mby5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElSZXNvdXJjZUxvYWRJ bmZvLmgJKHJldmlzaW9uIDI1NzcyMSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9B UElSZXNvdXJjZUxvYWRJbmZvLmgJKHdvcmtpbmcgY29weSkKQEAgLTQzLDYgKzQzLDggQEAgcHVi bGljOgogICAgIFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZElkZW50aWZpZXIgcmVzb3VyY2VM b2FkSUQoKSBjb25zdCB7IHJldHVybiBtX2luZm8ucmVzb3VyY2VMb2FkSUQ7IH0KICAgICBPcHRp b25hbDxXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXI+IGZyYW1lSUQoKSBjb25zdCB7IHJldHVybiBt X2luZm8uZnJhbWVJRDsgfQogICAgIE9wdGlvbmFsPFdlYkNvcmU6OkZyYW1lSWRlbnRpZmllcj4g cGFyZW50RnJhbWVJRCgpIGNvbnN0IHsgcmV0dXJuIG1faW5mby5wYXJlbnRGcmFtZUlEOyB9Cisg ICAgY29uc3QgV1RGOjpVUkwmIG9yaWdpbmFsVVJMKCkgY29uc3QgeyByZXR1cm4gbV9pbmZvLm9y aWdpbmFsVVJMOyB9CisgICAgY29uc3QgV1RGOjpTdHJpbmcmIG9yaWdpbmFsSFRUUE1ldGhvZCgp IGNvbnN0IHsgcmV0dXJuIG1faW5mby5vcmlnaW5hbEhUVFBNZXRob2Q7IH0KIAogcHJpdmF0ZToK ICAgICBjb25zdCBXZWJLaXQ6OlJlc291cmNlTG9hZEluZm8gbV9pbmZvOwpJbmRleDogU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1Jlc291cmNlTG9hZEluZm8uaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUmVzb3VyY2VMb2Fk SW5mby5oCShyZXZpc2lvbiAyNTc3MjEpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvX1dLUmVzb3VyY2VMb2FkSW5mby5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw4ICszNiwx MCBAQCBXS19DTEFTU19BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvCiAtIChpbnN0YW5j ZXR5cGUpaW5pdCBOU19VTkFWQUlMQUJMRTsKIAogQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRv bmx5KSB1aW50NjRfdCByZXNvdXJjZUxvYWRJRDsKLUBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFk b25seSkgX1dLRnJhbWVIYW5kbGUqIGZyYW1lOwotQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRv bmx5LCBudWxsYWJsZSkgX1dLRnJhbWVIYW5kbGUqIHBhcmVudEZyYW1lOworQHByb3BlcnR5IChu b25hdG9taWMsIHJlYWRvbmx5KSBfV0tGcmFtZUhhbmRsZSAqZnJhbWU7CitAcHJvcGVydHkgKG5v bmF0b21pYywgcmVhZG9ubHksIG51bGxhYmxlKSBfV0tGcmFtZUhhbmRsZSAqcGFyZW50RnJhbWU7 CitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIE5TVVJMICpvcmlnaW5hbFVSTDsKK0Bw cm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgTlNTdHJpbmcgKm9yaWdpbmFsSFRUUE1ldGhv ZDsKIAogQGVuZAogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dL UmVzb3VyY2VMb2FkSW5mby5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvX1dLUmVzb3VyY2VMb2FkSW5mby5tbQkocmV2aXNpb24gMjU3NzIxKQorKysg U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1Jlc291cmNlTG9hZEluZm8ubW0J KHdvcmtpbmcgY29weSkKQEAgLTU5LDYgKzU5LDE2IEBAIC0gKF9XS0ZyYW1lSGFuZGxlICopcGFy ZW50RnJhbWUKICAgICByZXR1cm4gbmlsOwogfQogCistIChOU1VSTCAqKW9yaWdpbmFsVVJMCit7 CisgICAgcmV0dXJuIF9pbmZvLT5vcmlnaW5hbFVSTCgpOworfQorCistIChOU1N0cmluZyAqKW9y aWdpbmFsSFRUUE1ldGhvZAoreworICAgIHJldHVybiBfaW5mby0+b3JpZ2luYWxIVFRQTWV0aG9k KCk7Cit9CisKIC0gKEFQSTo6T2JqZWN0JilfYXBpT2JqZWN0CiB7CiAgICAgcmV0dXJuICpfaW5m bzsKQEAgLTkyLDEwICsxMDIsMjQgQEAgLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoQ29kZXI6KE5T Q29kZXIgKgogICAgICAgICByZXR1cm4gbmlsOwogICAgIH0KIAorICAgIE5TVVJMICpvcmlnaW5h bFVSTCA9IFtjb2RlciBkZWNvZGVPYmplY3RPZkNsYXNzOltOU1VSTCBjbGFzc10gZm9yS2V5OkAi b3JpZ2luYWxVUkwiXTsKKyAgICBpZiAoIW9yaWdpbmFsVVJMKSB7CisgICAgICAgIFtzZWxmIHJl bGVhc2VdOworICAgICAgICByZXR1cm4gbmlsOworICAgIH0KKworICAgIE5TU3RyaW5nICpvcmln aW5hbEhUVFBNZXRob2QgPSBbY29kZXIgZGVjb2RlT2JqZWN0T2ZDbGFzczpbTlNTdHJpbmcgY2xh c3NdIGZvcktleTpAIm9yaWdpbmFsSFRUUE1ldGhvZCJdOworICAgIGlmICghb3JpZ2luYWxIVFRQ TWV0aG9kKSB7CisgICAgICAgIFtzZWxmIHJlbGVhc2VdOworICAgICAgICByZXR1cm4gbmlsOwor ICAgIH0KKwogICAgIFdlYktpdDo6UmVzb3VyY2VMb2FkSW5mbyBpbmZvIHsKICAgICAgICAgbWFr ZU9iamVjdElkZW50aWZpZXI8V2ViS2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkSWRlbnRpZmllclR5 cGU+KHJlc291cmNlTG9hZElELnVuc2lnbmVkTG9uZ0xvbmdWYWx1ZSksCiAgICAgICAgIG1ha2VP YmplY3RJZGVudGlmaWVyPFdlYkNvcmU6OkZyYW1lSWRlbnRpZmllclR5cGU+KGZyYW1lLnVuc2ln bmVkTG9uZ0xvbmdWYWx1ZSksCi0gICAgICAgIG1ha2VPYmplY3RJZGVudGlmaWVyPFdlYkNvcmU6 OkZyYW1lSWRlbnRpZmllclR5cGU+KHBhcmVudEZyYW1lLnVuc2lnbmVkTG9uZ0xvbmdWYWx1ZSkK KyAgICAgICAgbWFrZU9iamVjdElkZW50aWZpZXI8V2ViQ29yZTo6RnJhbWVJZGVudGlmaWVyVHlw ZT4ocGFyZW50RnJhbWUudW5zaWduZWRMb25nTG9uZ1ZhbHVlKSwKKyAgICAgICAgb3JpZ2luYWxV UkwsCisgICAgICAgIG9yaWdpbmFsSFRUUE1ldGhvZCwKICAgICB9OwogCiAgICAgQVBJOjpPYmpl Y3Q6OmNvbnN0cnVjdEluV3JhcHBlcjxBUEk6OlJlc291cmNlTG9hZEluZm8+KHNlbGYsIFdURk1v dmUoaW5mbykpOwpAQCAtMTA4LDYgKzEzMiw4IEBAIC0gKHZvaWQpZW5jb2RlV2l0aENvZGVyOihO U0NvZGVyICopY29kZXIKICAgICBbY29kZXIgZW5jb2RlT2JqZWN0OkAoc2VsZi5yZXNvdXJjZUxv YWRJRCkgZm9yS2V5OkAicmVzb3VyY2VMb2FkSUQiXTsKICAgICBbY29kZXIgZW5jb2RlT2JqZWN0 OkAoc2VsZi5mcmFtZS5mcmFtZUlEKSBmb3JLZXk6QCJmcmFtZSJdOwogICAgIFtjb2RlciBlbmNv ZGVPYmplY3Q6QChzZWxmLnBhcmVudEZyYW1lLmZyYW1lSUQpIGZvcktleTpAInBhcmVudEZyYW1l Il07CisgICAgW2NvZGVyIGVuY29kZU9iamVjdDpzZWxmLm9yaWdpbmFsVVJMIGZvcktleTpAIm9y aWdpbmFsVVJMIl07CisgICAgW2NvZGVyIGVuY29kZU9iamVjdDpzZWxmLm9yaWdpbmFsSFRUUE1l dGhvZCBmb3JLZXk6QCJvcmlnaW5hbEhUVFBNZXRob2QiXTsKIH0KIAogQGVuZApJbmRleDogVG9v bHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjU3 Nzg1KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAK KzIwMjAtMDMtMDMgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4K KworICAgICAgICBFeHBvc2Ugb3JpZ2luYWxVUkwgYW5kIG9yaWdpbmFsSFRUUE1ldGhvZCBvbiBf V0tSZXNvdXJjZUxvYWRJbmZvCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMDg1MjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUmVzb3VyY2VMb2Fk RGVsZWdhdGUubW06CisgICAgICAgIChURVNUKToKKwogMjAyMC0wMy0wMyAgSml0ZW4gTWVodGEg IDxqbWVodGFAYXBwbGUuY29tPgogCiAgICAgICAgIEFkb3B0IEhUVFAgQWx0ZXJuYXRpdmUgU2Vy dmljZXMgU3RvcmFnZQpJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL1Jlc291cmNlTG9hZERlbGVnYXRlLm1tCShyZXZpc2lvbiAy NTc3MjEpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Jlc291cmNl TG9hZERlbGVnYXRlLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xODEsOSArMTgxLDE1IEBAIFRFU1Qo UmVzb3VyY2VMb2FkRGVsZWdhdGUsIFJlZGlyZWN0KQogCiAgICAgX19ibG9jayBib29sIGRvbmUg PSBmYWxzZTsKICAgICBhdXRvIHJlc291cmNlTG9hZERlbGVnYXRlID0gYWRvcHROUyhbVGVzdFJl c291cmNlTG9hZERlbGVnYXRlIG5ld10pOwotICAgIFtyZXNvdXJjZUxvYWREZWxlZ2F0ZSBzZXRE aWRQZXJmb3JtSFRUUFJlZGlyZWN0aW9uOl4oV0tXZWJWaWV3ICosIF9XS1Jlc291cmNlTG9hZElu Zm8gKiwgTlNVUkxSZXNwb25zZSAqcmVzcG9uc2UsIE5TVVJMUmVxdWVzdCAqcmVxdWVzdCkgewor ICAgIFtyZXNvdXJjZUxvYWREZWxlZ2F0ZSBzZXREaWRQZXJmb3JtSFRUUFJlZGlyZWN0aW9uOl4o V0tXZWJWaWV3ICosIF9XS1Jlc291cmNlTG9hZEluZm8gKmxvYWRJbmZvLCBOU1VSTFJlc3BvbnNl ICpyZXNwb25zZSwgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0KSB7CiAgICAgICAgIEVYUEVDVF9XS19T VFJFUShyZXNwb25zZS5VUkwucGF0aCwgIi8iKTsKICAgICAgICAgRVhQRUNUX1dLX1NUUkVRKHJl cXVlc3QuVVJMLnBhdGgsICIvcmVkaXJlY3RUYXJnZXQiKTsKKyAgICAgICAgRVhQRUNUX1dLX1NU UkVRKGxvYWRJbmZvLm9yaWdpbmFsVVJMLnBhdGgsICIvIik7CisgICAgICAgIEVYUEVDVF9XS19T VFJFUShsb2FkSW5mby5vcmlnaW5hbEhUVFBNZXRob2QsICJHRVQiKTsKKyAgICB9XTsKKyAgICBb cmVzb3VyY2VMb2FkRGVsZWdhdGUgc2V0RGlkQ29tcGxldGVXaXRoRXJyb3I6XihXS1dlYlZpZXcg KiwgX1dLUmVzb3VyY2VMb2FkSW5mbyAqbG9hZEluZm8sIE5TRXJyb3IgKikgeworICAgICAgICBF WFBFQ1RfV0tfU1RSRVEobG9hZEluZm8ub3JpZ2luYWxVUkwucGF0aCwgIi8iKTsKKyAgICAgICAg RVhQRUNUX1dLX1NUUkVRKGxvYWRJbmZvLm9yaWdpbmFsSFRUUE1ldGhvZCwgIkdFVCIpOwogICAg ICAgICBkb25lID0gdHJ1ZTsKICAgICB9XTsKIApAQCAtMzA5LDEzICszMTUsMTUgQEAgVEVTVChS ZXNvdXJjZUxvYWREZWxlZ2F0ZSwgTG9hZEluZm8pCiAgICAgX1dLUmVzb3VyY2VMb2FkSW5mbyAq b3JpZ2luYWwgPSBsb2FkSW5mb3NbMF0uZ2V0KCk7CiAgICAgTlNFcnJvciAqZXJyb3IgPSBuaWw7 CiAgICAgTlNEYXRhICphcmNoaXZlRGF0YSA9IFtOU0tleWVkQXJjaGl2ZXIgYXJjaGl2ZWREYXRh V2l0aFJvb3RPYmplY3Q6b3JpZ2luYWwgcmVxdWlyaW5nU2VjdXJlQ29kaW5nOllFUyBlcnJvcjom ZXJyb3JdOwotICAgIEVYUEVDVF9FUShhcmNoaXZlRGF0YS5sZW5ndGgsIDI5OXVsbCk7CisgICAg RVhQRUNUX0VRKGFyY2hpdmVEYXRhLmxlbmd0aCwgNDgxdWxsKTsKICAgICBFWFBFQ1RfRkFMU0Uo ZXJyb3IpOwogICAgIF9XS1Jlc291cmNlTG9hZEluZm8gKmRlc2VyaWFsaXplZCA9IFtOU0tleWVk VW5hcmNoaXZlciB1bmFyY2hpdmVkT2JqZWN0T2ZDbGFzczpbX1dLUmVzb3VyY2VMb2FkSW5mbyBj bGFzc10gZnJvbURhdGE6YXJjaGl2ZURhdGEgZXJyb3I6JmVycm9yXTsKICAgICBFWFBFQ1RfRkFM U0UoZXJyb3IpOwogICAgIEVYUEVDVF9UUlVFKGRlc2VyaWFsaXplZC5yZXNvdXJjZUxvYWRJRCA9 PSBvcmlnaW5hbC5yZXNvdXJjZUxvYWRJRCk7CiAgICAgRVhQRUNUX1RSVUUoZGVzZXJpYWxpemVk LmZyYW1lLmZyYW1lSUQgPT0gb3JpZ2luYWwuZnJhbWUuZnJhbWVJRCk7CiAgICAgRVhQRUNUX1RS VUUoZGVzZXJpYWxpemVkLnBhcmVudEZyYW1lLmZyYW1lSUQgPT0gb3JpZ2luYWwucGFyZW50RnJh bWUuZnJhbWVJRCk7CisgICAgRVhQRUNUX1dLX1NUUkVRKGRlc2VyaWFsaXplZC5vcmlnaW5hbFVS TC5hYnNvbHV0ZVN0cmluZywgb3JpZ2luYWwub3JpZ2luYWxVUkwuYWJzb2x1dGVTdHJpbmcpOwor ICAgIEVYUEVDVF9XS19TVFJFUShkZXNlcmlhbGl6ZWQub3JpZ2luYWxIVFRQTWV0aG9kLCBvcmln aW5hbC5vcmlnaW5hbEhUVFBNZXRob2QpOwogfQogCiAjZW5kaWYgLy8gSEFWRShORVRXT1JLX0ZS QU1FV09SSykK 392327 2020-03-03 14:09:20 -0800 2020-03-03 14:24:52 -0800 Patch bug-208522-20200303140920.patch text/plain 9760 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTc3MjEpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDIwLTAzLTAzICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRXhwb3NlIG9yaWdp bmFsVVJMIGFuZCBvcmlnaW5hbEhUVFBNZXRob2Qgb24gX1dLUmVzb3VyY2VMb2FkSW5mbworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4NTIyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ292ZXJlZCBieSBB UEkgdGVzdHMuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2Fk ZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnJlc291cmNl TG9hZEluZm8pOgorICAgICAgICAqIFNoYXJlZC9SZXNvdXJjZUxvYWRJbmZvLmg6CisgICAgICAg IChXZWJLaXQ6OlJlc291cmNlTG9hZEluZm86OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJL aXQ6OlJlc291cmNlTG9hZEluZm86OmRlY29kZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9B UElSZXNvdXJjZUxvYWRJbmZvLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tS ZXNvdXJjZUxvYWRJbmZvLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tSZXNv dXJjZUxvYWRJbmZvLm1tOgorICAgICAgICAoLVtfV0tSZXNvdXJjZUxvYWRJbmZvIG9yaWdpbmFs VVJMXSk6CisgICAgICAgICgtW19XS1Jlc291cmNlTG9hZEluZm8gaW5pdFdpdGhDb2RlcjpdKToK KyAgICAgICAgKC1bX1dLUmVzb3VyY2VMb2FkSW5mbyBlbmNvZGVXaXRoQ29kZXI6XSk6CisKIDIw MjAtMDMtMDIgIEphY29iIFVwaG9mZiAgPGphY29iX3VwaG9mZkBhcHBsZS5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjI1NzY4Ny4KSW5kZXg6IFNvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAJKHJl dmlzaW9uIDI1NzcyMSkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jl c291cmNlTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzM5LDYgKzMzOSw4IEBAIFJlc291 cmNlTG9hZEluZm8gTmV0d29ya1Jlc291cmNlTG9hZGVyOjoKICAgICAgICAgbV9yZXNvdXJjZUxv YWRJRCwKICAgICAgICAgbV9wYXJhbWV0ZXJzLndlYkZyYW1lSUQsCiAgICAgICAgIG1fcGFyYW1l dGVycy5wYXJlbnRGcmFtZUlELAorICAgICAgICBvcmlnaW5hbFJlcXVlc3QoKS51cmwoKSwKKyAg ICAgICAgb3JpZ2luYWxSZXF1ZXN0KCkuaHR0cE1ldGhvZCgpCiAgICAgfTsKIH0KIApJbmRleDog U291cmNlL1dlYktpdC9TaGFyZWQvUmVzb3VyY2VMb2FkSW5mby5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvU2hhcmVkL1Jlc291cmNlTG9hZEluZm8uaAkocmV2aXNpb24gMjU3NzIxKQor KysgU291cmNlL1dlYktpdC9TaGFyZWQvUmVzb3VyY2VMb2FkSW5mby5oCSh3b3JraW5nIGNvcHkp CkBAIC0yOCw2ICsyOCw3IEBACiAjaW5jbHVkZSAiQXJndW1lbnRDb2RlcnMuaCIKICNpbmNsdWRl ICJOZXR3b3JrUmVzb3VyY2VMb2FkSWRlbnRpZmllci5oIgogI2luY2x1ZGUgPFdlYkNvcmUvRnJh bWVJZGVudGlmaWVyLmg+CisjaW5jbHVkZSA8d3RmL1VSTC5oPgogCiBuYW1lc3BhY2UgV2ViS2l0 IHsKIApAQCAtMzYsMTIgKzM3LDE2IEBAIHN0cnVjdCBSZXNvdXJjZUxvYWRJbmZvIHsKICAgICBO ZXR3b3JrUmVzb3VyY2VMb2FkSWRlbnRpZmllciByZXNvdXJjZUxvYWRJRDsKICAgICBPcHRpb25h bDxXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXI+IGZyYW1lSUQ7CiAgICAgT3B0aW9uYWw8V2ViQ29y ZTo6RnJhbWVJZGVudGlmaWVyPiBwYXJlbnRGcmFtZUlEOworICAgIFVSTCBvcmlnaW5hbFVSTDsK KyAgICBTdHJpbmcgb3JpZ2luYWxIVFRQTWV0aG9kOwogICAgIAogICAgIHZvaWQgZW5jb2RlKElQ Qzo6RW5jb2RlciYgZW5jb2RlcikgY29uc3QKICAgICB7CiAgICAgICAgIGVuY29kZXIgPDwgcmVz b3VyY2VMb2FkSUQ7CiAgICAgICAgIGVuY29kZXIgPDwgZnJhbWVJRDsKICAgICAgICAgZW5jb2Rl ciA8PCBwYXJlbnRGcmFtZUlEOworICAgICAgICBlbmNvZGVyIDw8IG9yaWdpbmFsVVJMOworICAg ICAgICBlbmNvZGVyIDw8IG9yaWdpbmFsSFRUUE1ldGhvZDsKICAgICB9CiAKICAgICBzdGF0aWMg T3B0aW9uYWw8UmVzb3VyY2VMb2FkSW5mbz4gZGVjb2RlKElQQzo6RGVjb2RlciYgZGVjb2RlcikK QEAgLTYxLDEwICs2NiwyMiBAQCBzdHJ1Y3QgUmVzb3VyY2VMb2FkSW5mbyB7CiAgICAgICAgIGlm ICghcGFyZW50RnJhbWVJRCkKICAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKKyAg ICAgICAgT3B0aW9uYWw8VVJMPiBvcmlnaW5hbFVSTDsKKyAgICAgICAgZGVjb2RlciA+PiBvcmln aW5hbFVSTDsKKyAgICAgICAgaWYgKCFvcmlnaW5hbFVSTCkKKyAgICAgICAgICAgIHJldHVybiBX VEY6Om51bGxvcHQ7CisKKyAgICAgICAgT3B0aW9uYWw8U3RyaW5nPiBvcmlnaW5hbEhUVFBNZXRo b2Q7CisgICAgICAgIGRlY29kZXIgPj4gb3JpZ2luYWxIVFRQTWV0aG9kOworICAgICAgICBpZiAo IW9yaWdpbmFsSFRUUE1ldGhvZCkKKyAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CisK ICAgICAgICAgcmV0dXJuIHt7CiAgICAgICAgICAgICBXVEZNb3ZlKCpyZXNvdXJjZUxvYWRJRCks CiAgICAgICAgICAgICBXVEZNb3ZlKCpmcmFtZUlEKSwKICAgICAgICAgICAgIFdURk1vdmUoKnBh cmVudEZyYW1lSUQpLAorICAgICAgICAgICAgV1RGTW92ZSgqb3JpZ2luYWxVUkwpLAorICAgICAg ICAgICAgV1RGTW92ZSgqb3JpZ2luYWxIVFRQTWV0aG9kKQogICAgICAgICB9fTsKICAgICB9CiB9 OwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVJlc291cmNlTG9hZEluZm8u aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUmVzb3VyY2VM b2FkSW5mby5oCShyZXZpc2lvbiAyNTc3MjEpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQVBJUmVzb3VyY2VMb2FkSW5mby5oCSh3b3JraW5nIGNvcHkpCkBAIC00Myw2ICs0Myw4IEBA IHB1YmxpYzoKICAgICBXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRJZGVudGlmaWVyIHJlc291 cmNlTG9hZElEKCkgY29uc3QgeyByZXR1cm4gbV9pbmZvLnJlc291cmNlTG9hZElEOyB9CiAgICAg T3B0aW9uYWw8V2ViQ29yZTo6RnJhbWVJZGVudGlmaWVyPiBmcmFtZUlEKCkgY29uc3QgeyByZXR1 cm4gbV9pbmZvLmZyYW1lSUQ7IH0KICAgICBPcHRpb25hbDxXZWJDb3JlOjpGcmFtZUlkZW50aWZp ZXI+IHBhcmVudEZyYW1lSUQoKSBjb25zdCB7IHJldHVybiBtX2luZm8ucGFyZW50RnJhbWVJRDsg fQorICAgIGNvbnN0IFdURjo6VVJMJiBvcmlnaW5hbFVSTCgpIGNvbnN0IHsgcmV0dXJuIG1faW5m by5vcmlnaW5hbFVSTDsgfQorICAgIGNvbnN0IFdURjo6U3RyaW5nJiBvcmlnaW5hbEhUVFBNZXRo b2QoKSBjb25zdCB7IHJldHVybiBtX2luZm8ub3JpZ2luYWxIVFRQTWV0aG9kOyB9CiAKIHByaXZh dGU6CiAgICAgY29uc3QgV2ViS2l0OjpSZXNvdXJjZUxvYWRJbmZvIG1faW5mbzsKSW5kZXg6IFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tSZXNvdXJjZUxvYWRJbmZvLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1Jlc291cmNl TG9hZEluZm8uaAkocmV2aXNpb24gMjU3NzIxKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL19XS1Jlc291cmNlTG9hZEluZm8uaAkod29ya2luZyBjb3B5KQpAQCAtMzYsOCAr MzYsMTAgQEAgV0tfQ0xBU1NfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpbwogLSAoaW5z dGFuY2V0eXBlKWluaXQgTlNfVU5BVkFJTEFCTEU7CiAKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBy ZWFkb25seSkgdWludDY0X3QgcmVzb3VyY2VMb2FkSUQ7Ci1AcHJvcGVydHkgKG5vbmF0b21pYywg cmVhZG9ubHkpIF9XS0ZyYW1lSGFuZGxlKiBmcmFtZTsKLUBwcm9wZXJ0eSAobm9uYXRvbWljLCBy ZWFkb25seSwgbnVsbGFibGUpIF9XS0ZyYW1lSGFuZGxlKiBwYXJlbnRGcmFtZTsKK0Bwcm9wZXJ0 eSAobm9uYXRvbWljLCByZWFkb25seSkgX1dLRnJhbWVIYW5kbGUgKmZyYW1lOworQHByb3BlcnR5 IChub25hdG9taWMsIHJlYWRvbmx5LCBudWxsYWJsZSkgX1dLRnJhbWVIYW5kbGUgKnBhcmVudEZy YW1lOworQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBOU1VSTCAqb3JpZ2luYWxVUkw7 CitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIE5TU3RyaW5nICpvcmlnaW5hbEhUVFBN ZXRob2Q7CiAKIEBlbmQKIApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L19XS1Jlc291cmNlTG9hZEluZm8ubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL19XS1Jlc291cmNlTG9hZEluZm8ubW0JKHJldmlzaW9uIDI1NzcyMSkK KysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tSZXNvdXJjZUxvYWRJbmZv Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC01OSw2ICs1OSwxNiBAQCAtIChfV0tGcmFtZUhhbmRsZSAq KXBhcmVudEZyYW1lCiAgICAgcmV0dXJuIG5pbDsKIH0KIAorLSAoTlNVUkwgKilvcmlnaW5hbFVS TAoreworICAgIHJldHVybiBfaW5mby0+b3JpZ2luYWxVUkwoKTsKK30KKworLSAoTlNTdHJpbmcg KilvcmlnaW5hbEhUVFBNZXRob2QKK3sKKyAgICByZXR1cm4gX2luZm8tPm9yaWdpbmFsSFRUUE1l dGhvZCgpOworfQorCiAtIChBUEk6Ok9iamVjdCYpX2FwaU9iamVjdAogewogICAgIHJldHVybiAq X2luZm87CkBAIC05MiwxMCArMTAyLDI0IEBAIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aENvZGVy OihOU0NvZGVyICoKICAgICAgICAgcmV0dXJuIG5pbDsKICAgICB9CiAKKyAgICBOU1VSTCAqb3Jp Z2luYWxVUkwgPSBbY29kZXIgZGVjb2RlT2JqZWN0T2ZDbGFzczpbTlNVUkwgY2xhc3NdIGZvcktl eTpAIm9yaWdpbmFsVVJMIl07CisgICAgaWYgKCFvcmlnaW5hbFVSTCkgeworICAgICAgICBbc2Vs ZiByZWxlYXNlXTsKKyAgICAgICAgcmV0dXJuIG5pbDsKKyAgICB9CisKKyAgICBOU1N0cmluZyAq b3JpZ2luYWxIVFRQTWV0aG9kID0gW2NvZGVyIGRlY29kZU9iamVjdE9mQ2xhc3M6W05TU3RyaW5n IGNsYXNzXSBmb3JLZXk6QCJvcmlnaW5hbEhUVFBNZXRob2QiXTsKKyAgICBpZiAoIW9yaWdpbmFs SFRUUE1ldGhvZCkgeworICAgICAgICBbc2VsZiByZWxlYXNlXTsKKyAgICAgICAgcmV0dXJuIG5p bDsKKyAgICB9CisKICAgICBXZWJLaXQ6OlJlc291cmNlTG9hZEluZm8gaW5mbyB7CiAgICAgICAg IG1ha2VPYmplY3RJZGVudGlmaWVyPFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZElkZW50aWZp ZXJUeXBlPihyZXNvdXJjZUxvYWRJRC51bnNpZ25lZExvbmdMb25nVmFsdWUpLAogICAgICAgICBt YWtlT2JqZWN0SWRlbnRpZmllcjxXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXJUeXBlPihmcmFtZS51 bnNpZ25lZExvbmdMb25nVmFsdWUpLAotICAgICAgICBtYWtlT2JqZWN0SWRlbnRpZmllcjxXZWJD b3JlOjpGcmFtZUlkZW50aWZpZXJUeXBlPihwYXJlbnRGcmFtZS51bnNpZ25lZExvbmdMb25nVmFs dWUpCisgICAgICAgIG1ha2VPYmplY3RJZGVudGlmaWVyPFdlYkNvcmU6OkZyYW1lSWRlbnRpZmll clR5cGU+KHBhcmVudEZyYW1lLnVuc2lnbmVkTG9uZ0xvbmdWYWx1ZSksCisgICAgICAgIG9yaWdp bmFsVVJMLAorICAgICAgICBvcmlnaW5hbEhUVFBNZXRob2QsCiAgICAgfTsKIAogICAgIEFQSTo6 T2JqZWN0Ojpjb25zdHJ1Y3RJbldyYXBwZXI8QVBJOjpSZXNvdXJjZUxvYWRJbmZvPihzZWxmLCBX VEZNb3ZlKGluZm8pKTsKQEAgLTEwOCw2ICsxMzIsOCBAQCAtICh2b2lkKWVuY29kZVdpdGhDb2Rl cjooTlNDb2RlciAqKWNvZGVyCiAgICAgW2NvZGVyIGVuY29kZU9iamVjdDpAKHNlbGYucmVzb3Vy Y2VMb2FkSUQpIGZvcktleTpAInJlc291cmNlTG9hZElEIl07CiAgICAgW2NvZGVyIGVuY29kZU9i amVjdDpAKHNlbGYuZnJhbWUuZnJhbWVJRCkgZm9yS2V5OkAiZnJhbWUiXTsKICAgICBbY29kZXIg ZW5jb2RlT2JqZWN0OkAoc2VsZi5wYXJlbnRGcmFtZS5mcmFtZUlEKSBmb3JLZXk6QCJwYXJlbnRG cmFtZSJdOworICAgIFtjb2RlciBlbmNvZGVPYmplY3Q6c2VsZi5vcmlnaW5hbFVSTCBmb3JLZXk6 QCJvcmlnaW5hbFVSTCJdOworICAgIFtjb2RlciBlbmNvZGVPYmplY3Q6c2VsZi5vcmlnaW5hbEhU VFBNZXRob2QgZm9yS2V5OkAib3JpZ2luYWxIVFRQTWV0aG9kIl07CiB9CiAKIEBlbmQKSW5kZXg6 IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9u IDI1Nzc4NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEz IEBACisyMDIwLTAzLTAzICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5v cmc+CisKKyAgICAgICAgRXhwb3NlIG9yaWdpbmFsVVJMIGFuZCBvcmlnaW5hbEhUVFBNZXRob2Qg b24gX1dLUmVzb3VyY2VMb2FkSW5mbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjA4NTIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Jlc291cmNl TG9hZERlbGVnYXRlLm1tOgorICAgICAgICAoVEVTVCk6CisKIDIwMjAtMDMtMDMgIEppdGVuIE1l aHRhICA8am1laHRhQGFwcGxlLmNvbT4KIAogICAgICAgICBBZG9wdCBIVFRQIEFsdGVybmF0aXZl IFNlcnZpY2VzIFN0b3JhZ2UKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvUmVzb3VyY2VMb2FkRGVsZWdhdGUubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbQkocmV2aXNp b24gMjU3NzIxKQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9SZXNv dXJjZUxvYWREZWxlZ2F0ZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMTgxLDkgKzE4MSwxNSBAQCBU RVNUKFJlc291cmNlTG9hZERlbGVnYXRlLCBSZWRpcmVjdCkKIAogICAgIF9fYmxvY2sgYm9vbCBk b25lID0gZmFsc2U7CiAgICAgYXV0byByZXNvdXJjZUxvYWREZWxlZ2F0ZSA9IGFkb3B0TlMoW1Rl c3RSZXNvdXJjZUxvYWREZWxlZ2F0ZSBuZXddKTsKLSAgICBbcmVzb3VyY2VMb2FkRGVsZWdhdGUg c2V0RGlkUGVyZm9ybUhUVFBSZWRpcmVjdGlvbjpeKFdLV2ViVmlldyAqLCBfV0tSZXNvdXJjZUxv YWRJbmZvICosIE5TVVJMUmVzcG9uc2UgKnJlc3BvbnNlLCBOU1VSTFJlcXVlc3QgKnJlcXVlc3Qp IHsKKyAgICBbcmVzb3VyY2VMb2FkRGVsZWdhdGUgc2V0RGlkUGVyZm9ybUhUVFBSZWRpcmVjdGlv bjpeKFdLV2ViVmlldyAqLCBfV0tSZXNvdXJjZUxvYWRJbmZvICpsb2FkSW5mbywgTlNVUkxSZXNw b25zZSAqcmVzcG9uc2UsIE5TVVJMUmVxdWVzdCAqcmVxdWVzdCkgewogICAgICAgICBFWFBFQ1Rf V0tfU1RSRVEocmVzcG9uc2UuVVJMLnBhdGgsICIvIik7CiAgICAgICAgIEVYUEVDVF9XS19TVFJF UShyZXF1ZXN0LlVSTC5wYXRoLCAiL3JlZGlyZWN0VGFyZ2V0Iik7CisgICAgICAgIEVYUEVDVF9X S19TVFJFUShsb2FkSW5mby5vcmlnaW5hbFVSTC5wYXRoLCAiLyIpOworICAgICAgICBFWFBFQ1Rf V0tfU1RSRVEobG9hZEluZm8ub3JpZ2luYWxIVFRQTWV0aG9kLCAiR0VUIik7CisgICAgfV07Cisg ICAgW3Jlc291cmNlTG9hZERlbGVnYXRlIHNldERpZENvbXBsZXRlV2l0aEVycm9yOl4oV0tXZWJW aWV3ICosIF9XS1Jlc291cmNlTG9hZEluZm8gKmxvYWRJbmZvLCBOU0Vycm9yICopIHsKKyAgICAg ICAgRVhQRUNUX1dLX1NUUkVRKGxvYWRJbmZvLm9yaWdpbmFsVVJMLnBhdGgsICIvIik7CisgICAg ICAgIEVYUEVDVF9XS19TVFJFUShsb2FkSW5mby5vcmlnaW5hbEhUVFBNZXRob2QsICJHRVQiKTsK ICAgICAgICAgZG9uZSA9IHRydWU7CiAgICAgfV07CiAKQEAgLTMwOSwxMyArMzE1LDE1IEBAIFRF U1QoUmVzb3VyY2VMb2FkRGVsZWdhdGUsIExvYWRJbmZvKQogICAgIF9XS1Jlc291cmNlTG9hZElu Zm8gKm9yaWdpbmFsID0gbG9hZEluZm9zWzBdLmdldCgpOwogICAgIE5TRXJyb3IgKmVycm9yID0g bmlsOwogICAgIE5TRGF0YSAqYXJjaGl2ZURhdGEgPSBbTlNLZXllZEFyY2hpdmVyIGFyY2hpdmVk RGF0YVdpdGhSb290T2JqZWN0Om9yaWdpbmFsIHJlcXVpcmluZ1NlY3VyZUNvZGluZzpZRVMgZXJy b3I6JmVycm9yXTsKLSAgICBFWFBFQ1RfRVEoYXJjaGl2ZURhdGEubGVuZ3RoLCAyOTl1bGwpOwor ICAgIEVYUEVDVF9FUShhcmNoaXZlRGF0YS5sZW5ndGgsIDQ4MXVsbCk7CiAgICAgRVhQRUNUX0ZB TFNFKGVycm9yKTsKICAgICBfV0tSZXNvdXJjZUxvYWRJbmZvICpkZXNlcmlhbGl6ZWQgPSBbTlNL ZXllZFVuYXJjaGl2ZXIgdW5hcmNoaXZlZE9iamVjdE9mQ2xhc3M6W19XS1Jlc291cmNlTG9hZElu Zm8gY2xhc3NdIGZyb21EYXRhOmFyY2hpdmVEYXRhIGVycm9yOiZlcnJvcl07CiAgICAgRVhQRUNU X0ZBTFNFKGVycm9yKTsKICAgICBFWFBFQ1RfVFJVRShkZXNlcmlhbGl6ZWQucmVzb3VyY2VMb2Fk SUQgPT0gb3JpZ2luYWwucmVzb3VyY2VMb2FkSUQpOwogICAgIEVYUEVDVF9UUlVFKGRlc2VyaWFs aXplZC5mcmFtZS5mcmFtZUlEID09IG9yaWdpbmFsLmZyYW1lLmZyYW1lSUQpOwogICAgIEVYUEVD VF9UUlVFKGRlc2VyaWFsaXplZC5wYXJlbnRGcmFtZS5mcmFtZUlEID09IG9yaWdpbmFsLnBhcmVu dEZyYW1lLmZyYW1lSUQpOworICAgIEVYUEVDVF9XS19TVFJFUShkZXNlcmlhbGl6ZWQub3JpZ2lu YWxVUkwuYWJzb2x1dGVTdHJpbmcsIG9yaWdpbmFsLm9yaWdpbmFsVVJMLmFic29sdXRlU3RyaW5n KTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoZGVzZXJpYWxpemVkLm9yaWdpbmFsSFRUUE1ldGhvZCwg b3JpZ2luYWwub3JpZ2luYWxIVFRQTWV0aG9kKTsKIH0KIAogI2VuZGlmIC8vIEhBVkUoTkVUV09S S19GUkFNRVdPUkspCg== 392330 2020-03-03 14:24:53 -0800 2020-03-03 14:27:18 -0800 Patch bug-208522-20200303142453.patch text/plain 10782 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTc3MjEpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDIwLTAzLTAzICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRXhwb3NlIG9yaWdp bmFsVVJMIGFuZCBvcmlnaW5hbEhUVFBNZXRob2Qgb24gX1dLUmVzb3VyY2VMb2FkSW5mbworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4NTIyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ292ZXJlZCBieSBB UEkgdGVzdHMuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2Fk ZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnJlc291cmNl TG9hZEluZm8pOgorICAgICAgICAqIFNoYXJlZC9SZXNvdXJjZUxvYWRJbmZvLmg6CisgICAgICAg IChXZWJLaXQ6OlJlc291cmNlTG9hZEluZm86OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJL aXQ6OlJlc291cmNlTG9hZEluZm86OmRlY29kZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9B UElSZXNvdXJjZUxvYWRJbmZvLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tS ZXNvdXJjZUxvYWRJbmZvLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tSZXNv dXJjZUxvYWRJbmZvLm1tOgorICAgICAgICAoLVtfV0tSZXNvdXJjZUxvYWRJbmZvIG9yaWdpbmFs VVJMXSk6CisgICAgICAgICgtW19XS1Jlc291cmNlTG9hZEluZm8gaW5pdFdpdGhDb2RlcjpdKToK KyAgICAgICAgKC1bX1dLUmVzb3VyY2VMb2FkSW5mbyBlbmNvZGVXaXRoQ29kZXI6XSk6CisKIDIw MjAtMDMtMDIgIEphY29iIFVwaG9mZiAgPGphY29iX3VwaG9mZkBhcHBsZS5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjI1NzY4Ny4KSW5kZXg6IFNvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAJKHJl dmlzaW9uIDI1NzcyMSkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jl c291cmNlTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzM5LDYgKzMzOSw5IEBAIFJlc291 cmNlTG9hZEluZm8gTmV0d29ya1Jlc291cmNlTG9hZGVyOjoKICAgICAgICAgbV9yZXNvdXJjZUxv YWRJRCwKICAgICAgICAgbV9wYXJhbWV0ZXJzLndlYkZyYW1lSUQsCiAgICAgICAgIG1fcGFyYW1l dGVycy5wYXJlbnRGcmFtZUlELAorICAgICAgICBvcmlnaW5hbFJlcXVlc3QoKS51cmwoKSwKKyAg ICAgICAgb3JpZ2luYWxSZXF1ZXN0KCkuaHR0cE1ldGhvZCgpLAorICAgICAgICBXYWxsVGltZTo6 bm93KCkKICAgICB9OwogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9SZXNvdXJjZUxv YWRJbmZvLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvUmVzb3VyY2VMb2Fk SW5mby5oCShyZXZpc2lvbiAyNTc3MjEpCisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9SZXNvdXJj ZUxvYWRJbmZvLmgJKHdvcmtpbmcgY29weSkKQEAgLTI4LDYgKzI4LDggQEAKICNpbmNsdWRlICJB cmd1bWVudENvZGVycy5oIgogI2luY2x1ZGUgIk5ldHdvcmtSZXNvdXJjZUxvYWRJZGVudGlmaWVy LmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9GcmFtZUlkZW50aWZpZXIuaD4KKyNpbmNsdWRlIDx3dGYv VVJMLmg+CisjaW5jbHVkZSA8d3RmL1dhbGxUaW1lLmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgewog CkBAIC0zNiwxMiArMzgsMTggQEAgc3RydWN0IFJlc291cmNlTG9hZEluZm8gewogICAgIE5ldHdv cmtSZXNvdXJjZUxvYWRJZGVudGlmaWVyIHJlc291cmNlTG9hZElEOwogICAgIE9wdGlvbmFsPFdl YkNvcmU6OkZyYW1lSWRlbnRpZmllcj4gZnJhbWVJRDsKICAgICBPcHRpb25hbDxXZWJDb3JlOjpG cmFtZUlkZW50aWZpZXI+IHBhcmVudEZyYW1lSUQ7CisgICAgVVJMIG9yaWdpbmFsVVJMOworICAg IFN0cmluZyBvcmlnaW5hbEhUVFBNZXRob2Q7CisgICAgV2FsbFRpbWUgZXZlbnRUaW1lc3RhbXA7 CiAgICAgCiAgICAgdm9pZCBlbmNvZGUoSVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAg IHsKICAgICAgICAgZW5jb2RlciA8PCByZXNvdXJjZUxvYWRJRDsKICAgICAgICAgZW5jb2RlciA8 PCBmcmFtZUlEOwogICAgICAgICBlbmNvZGVyIDw8IHBhcmVudEZyYW1lSUQ7CisgICAgICAgIGVu Y29kZXIgPDwgb3JpZ2luYWxVUkw7CisgICAgICAgIGVuY29kZXIgPDwgb3JpZ2luYWxIVFRQTWV0 aG9kOworICAgICAgICBlbmNvZGVyIDw8IGV2ZW50VGltZXN0YW1wOwogICAgIH0KIAogICAgIHN0 YXRpYyBPcHRpb25hbDxSZXNvdXJjZUxvYWRJbmZvPiBkZWNvZGUoSVBDOjpEZWNvZGVyJiBkZWNv ZGVyKQpAQCAtNjEsMTAgKzY5LDI4IEBAIHN0cnVjdCBSZXNvdXJjZUxvYWRJbmZvIHsKICAgICAg ICAgaWYgKCFwYXJlbnRGcmFtZUlEKQogICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsK IAorICAgICAgICBPcHRpb25hbDxVUkw+IG9yaWdpbmFsVVJMOworICAgICAgICBkZWNvZGVyID4+ IG9yaWdpbmFsVVJMOworICAgICAgICBpZiAoIW9yaWdpbmFsVVJMKQorICAgICAgICAgICAgcmV0 dXJuIFdURjo6bnVsbG9wdDsKKworICAgICAgICBPcHRpb25hbDxTdHJpbmc+IG9yaWdpbmFsSFRU UE1ldGhvZDsKKyAgICAgICAgZGVjb2RlciA+PiBvcmlnaW5hbEhUVFBNZXRob2Q7CisgICAgICAg IGlmICghb3JpZ2luYWxIVFRQTWV0aG9kKQorICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9w dDsKKworICAgICAgICBPcHRpb25hbDxXYWxsVGltZT4gZXZlbnRUaW1lc3RhbXA7CisgICAgICAg IGRlY29kZXIgPj4gZXZlbnRUaW1lc3RhbXA7CisgICAgICAgIGlmICghZXZlbnRUaW1lc3RhbXAp CisgICAgICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OworICAgICAgICAKICAgICAgICAgcmV0 dXJuIHt7CiAgICAgICAgICAgICBXVEZNb3ZlKCpyZXNvdXJjZUxvYWRJRCksCiAgICAgICAgICAg ICBXVEZNb3ZlKCpmcmFtZUlEKSwKICAgICAgICAgICAgIFdURk1vdmUoKnBhcmVudEZyYW1lSUQp LAorICAgICAgICAgICAgV1RGTW92ZSgqb3JpZ2luYWxVUkwpLAorICAgICAgICAgICAgV1RGTW92 ZSgqb3JpZ2luYWxIVFRQTWV0aG9kKSwKKyAgICAgICAgICAgIFdURk1vdmUoKmV2ZW50VGltZXN0 YW1wKQogICAgICAgICB9fTsKICAgICB9CiB9OwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0FQSVJlc291cmNlTG9hZEluZm8uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQVBJUmVzb3VyY2VMb2FkSW5mby5oCShyZXZpc2lvbiAyNTc3MjEpCisr KyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUmVzb3VyY2VMb2FkSW5mby5oCSh3b3Jr aW5nIGNvcHkpCkBAIC00Myw2ICs0Myw5IEBAIHB1YmxpYzoKICAgICBXZWJLaXQ6Ok5ldHdvcmtS ZXNvdXJjZUxvYWRJZGVudGlmaWVyIHJlc291cmNlTG9hZElEKCkgY29uc3QgeyByZXR1cm4gbV9p bmZvLnJlc291cmNlTG9hZElEOyB9CiAgICAgT3B0aW9uYWw8V2ViQ29yZTo6RnJhbWVJZGVudGlm aWVyPiBmcmFtZUlEKCkgY29uc3QgeyByZXR1cm4gbV9pbmZvLmZyYW1lSUQ7IH0KICAgICBPcHRp b25hbDxXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXI+IHBhcmVudEZyYW1lSUQoKSBjb25zdCB7IHJl dHVybiBtX2luZm8ucGFyZW50RnJhbWVJRDsgfQorICAgIGNvbnN0IFdURjo6VVJMJiBvcmlnaW5h bFVSTCgpIGNvbnN0IHsgcmV0dXJuIG1faW5mby5vcmlnaW5hbFVSTDsgfQorICAgIGNvbnN0IFdU Rjo6U3RyaW5nJiBvcmlnaW5hbEhUVFBNZXRob2QoKSBjb25zdCB7IHJldHVybiBtX2luZm8ub3Jp Z2luYWxIVFRQTWV0aG9kOyB9CisgICAgV2FsbFRpbWUgZXZlbnRUaW1lc3RhbXAoKSBjb25zdCB7 IHJldHVybiBtX2luZm8uZXZlbnRUaW1lc3RhbXA7IH0KIAogcHJpdmF0ZToKICAgICBjb25zdCBX ZWJLaXQ6OlJlc291cmNlTG9hZEluZm8gbV9pbmZvOwpJbmRleDogU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL19XS1Jlc291cmNlTG9hZEluZm8uaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUmVzb3VyY2VMb2FkSW5mby5oCShyZXZp c2lvbiAyNTc3MjEpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUmVz b3VyY2VMb2FkSW5mby5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw4ICszNiwxMSBAQCBXS19DTEFT U19BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvCiAtIChpbnN0YW5jZXR5cGUpaW5pdCBO U19VTkFWQUlMQUJMRTsKIAogQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSB1aW50NjRf dCByZXNvdXJjZUxvYWRJRDsKLUBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgX1dLRnJh bWVIYW5kbGUqIGZyYW1lOwotQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5LCBudWxsYWJs ZSkgX1dLRnJhbWVIYW5kbGUqIHBhcmVudEZyYW1lOworQHByb3BlcnR5IChub25hdG9taWMsIHJl YWRvbmx5KSBfV0tGcmFtZUhhbmRsZSAqZnJhbWU7CitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVh ZG9ubHksIG51bGxhYmxlKSBfV0tGcmFtZUhhbmRsZSAqcGFyZW50RnJhbWU7CitAcHJvcGVydHkg KG5vbmF0b21pYywgcmVhZG9ubHkpIE5TVVJMICpvcmlnaW5hbFVSTDsKK0Bwcm9wZXJ0eSAobm9u YXRvbWljLCByZWFkb25seSkgTlNTdHJpbmcgKm9yaWdpbmFsSFRUUE1ldGhvZDsKK0Bwcm9wZXJ0 eSAobm9uYXRvbWljLCByZWFkb25seSkgTlNEYXRlICpldmVudFRpbWVzdGFtcDsKIAogQGVuZAog CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUmVzb3VyY2VMb2Fk SW5mby5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev X1dLUmVzb3VyY2VMb2FkSW5mby5tbQkocmV2aXNpb24gMjU3NzIxKQorKysgU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1Jlc291cmNlTG9hZEluZm8ubW0JKHdvcmtpbmcgY29w eSkKQEAgLTU5LDYgKzU5LDIxIEBAIC0gKF9XS0ZyYW1lSGFuZGxlICopcGFyZW50RnJhbWUKICAg ICByZXR1cm4gbmlsOwogfQogCistIChOU1VSTCAqKW9yaWdpbmFsVVJMCit7CisgICAgcmV0dXJu IF9pbmZvLT5vcmlnaW5hbFVSTCgpOworfQorCistIChOU1N0cmluZyAqKW9yaWdpbmFsSFRUUE1l dGhvZAoreworICAgIHJldHVybiBfaW5mby0+b3JpZ2luYWxIVFRQTWV0aG9kKCk7Cit9CisKKy0g KE5TRGF0ZSAqKWV2ZW50VGltZXN0YW1wCit7CisgICAgcmV0dXJuIFtOU0RhdGUgZGF0ZVdpdGhU aW1lSW50ZXJ2YWxTaW5jZTE5NzA6X2luZm8tPmV2ZW50VGltZXN0YW1wKCkuc2Vjb25kc1NpbmNl RXBvY2goKS5zZWNvbmRzKCldOworfQorCiAtIChBUEk6Ok9iamVjdCYpX2FwaU9iamVjdAogewog ICAgIHJldHVybiAqX2luZm87CkBAIC05MiwxMCArMTA3LDMxIEBAIC0gKGluc3RhbmNldHlwZSlp bml0V2l0aENvZGVyOihOU0NvZGVyICoKICAgICAgICAgcmV0dXJuIG5pbDsKICAgICB9CiAKKyAg ICBOU1VSTCAqb3JpZ2luYWxVUkwgPSBbY29kZXIgZGVjb2RlT2JqZWN0T2ZDbGFzczpbTlNVUkwg Y2xhc3NdIGZvcktleTpAIm9yaWdpbmFsVVJMIl07CisgICAgaWYgKCFvcmlnaW5hbFVSTCkgewor ICAgICAgICBbc2VsZiByZWxlYXNlXTsKKyAgICAgICAgcmV0dXJuIG5pbDsKKyAgICB9CisKKyAg ICBOU1N0cmluZyAqb3JpZ2luYWxIVFRQTWV0aG9kID0gW2NvZGVyIGRlY29kZU9iamVjdE9mQ2xh c3M6W05TU3RyaW5nIGNsYXNzXSBmb3JLZXk6QCJvcmlnaW5hbEhUVFBNZXRob2QiXTsKKyAgICBp ZiAoIW9yaWdpbmFsSFRUUE1ldGhvZCkgeworICAgICAgICBbc2VsZiByZWxlYXNlXTsKKyAgICAg ICAgcmV0dXJuIG5pbDsKKyAgICB9CisKKyAgICBOU0RhdGUgKmV2ZW50VGltZXN0YW1wID0gW2Nv ZGVyIGRlY29kZU9iamVjdE9mQ2xhc3M6W05TRGF0ZSBjbGFzc10gZm9yS2V5OkAiZXZlbnRUaW1l c3RhbXAiXTsKKyAgICBpZiAoIWV2ZW50VGltZXN0YW1wKSB7CisgICAgICAgIFtzZWxmIHJlbGVh c2VdOworICAgICAgICByZXR1cm4gbmlsOworICAgIH0KKwogICAgIFdlYktpdDo6UmVzb3VyY2VM b2FkSW5mbyBpbmZvIHsKICAgICAgICAgbWFrZU9iamVjdElkZW50aWZpZXI8V2ViS2l0OjpOZXR3 b3JrUmVzb3VyY2VMb2FkSWRlbnRpZmllclR5cGU+KHJlc291cmNlTG9hZElELnVuc2lnbmVkTG9u Z0xvbmdWYWx1ZSksCiAgICAgICAgIG1ha2VPYmplY3RJZGVudGlmaWVyPFdlYkNvcmU6OkZyYW1l SWRlbnRpZmllclR5cGU+KGZyYW1lLnVuc2lnbmVkTG9uZ0xvbmdWYWx1ZSksCi0gICAgICAgIG1h a2VPYmplY3RJZGVudGlmaWVyPFdlYkNvcmU6OkZyYW1lSWRlbnRpZmllclR5cGU+KHBhcmVudEZy YW1lLnVuc2lnbmVkTG9uZ0xvbmdWYWx1ZSkKKyAgICAgICAgbWFrZU9iamVjdElkZW50aWZpZXI8 V2ViQ29yZTo6RnJhbWVJZGVudGlmaWVyVHlwZT4ocGFyZW50RnJhbWUudW5zaWduZWRMb25nTG9u Z1ZhbHVlKSwKKyAgICAgICAgb3JpZ2luYWxVUkwsCisgICAgICAgIG9yaWdpbmFsSFRUUE1ldGhv ZCwKKyAgICAgICAgV2FsbFRpbWU6OmZyb21SYXdTZWNvbmRzKGV2ZW50VGltZXN0YW1wLnRpbWVJ bnRlcnZhbFNpbmNlMTk3MCkKICAgICB9OwogCiAgICAgQVBJOjpPYmplY3Q6OmNvbnN0cnVjdElu V3JhcHBlcjxBUEk6OlJlc291cmNlTG9hZEluZm8+KHNlbGYsIFdURk1vdmUoaW5mbykpOwpAQCAt MTA4LDYgKzE0NCw5IEBAIC0gKHZvaWQpZW5jb2RlV2l0aENvZGVyOihOU0NvZGVyICopY29kZXIK ICAgICBbY29kZXIgZW5jb2RlT2JqZWN0OkAoc2VsZi5yZXNvdXJjZUxvYWRJRCkgZm9yS2V5OkAi cmVzb3VyY2VMb2FkSUQiXTsKICAgICBbY29kZXIgZW5jb2RlT2JqZWN0OkAoc2VsZi5mcmFtZS5m cmFtZUlEKSBmb3JLZXk6QCJmcmFtZSJdOwogICAgIFtjb2RlciBlbmNvZGVPYmplY3Q6QChzZWxm LnBhcmVudEZyYW1lLmZyYW1lSUQpIGZvcktleTpAInBhcmVudEZyYW1lIl07CisgICAgW2NvZGVy IGVuY29kZU9iamVjdDpzZWxmLm9yaWdpbmFsVVJMIGZvcktleTpAIm9yaWdpbmFsVVJMIl07Cisg ICAgW2NvZGVyIGVuY29kZU9iamVjdDpzZWxmLm9yaWdpbmFsSFRUUE1ldGhvZCBmb3JLZXk6QCJv cmlnaW5hbEhUVFBNZXRob2QiXTsKKyAgICBbY29kZXIgZW5jb2RlT2JqZWN0OnNlbGYuZXZlbnRU aW1lc3RhbXAgZm9yS2V5OkAiZXZlbnRUaW1lc3RhbXAiXTsKIH0KIAogQGVuZApJbmRleDogVG9v bHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjU3 Nzg1KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAK KzIwMjAtMDMtMDMgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4K KworICAgICAgICBFeHBvc2Ugb3JpZ2luYWxVUkwgYW5kIG9yaWdpbmFsSFRUUE1ldGhvZCBvbiBf V0tSZXNvdXJjZUxvYWRJbmZvCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMDg1MjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUmVzb3VyY2VMb2Fk RGVsZWdhdGUubW06CisgICAgICAgIChURVNUKToKKwogMjAyMC0wMy0wMyAgSml0ZW4gTWVodGEg IDxqbWVodGFAYXBwbGUuY29tPgogCiAgICAgICAgIEFkb3B0IEhUVFAgQWx0ZXJuYXRpdmUgU2Vy dmljZXMgU3RvcmFnZQpJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL1Jlc291cmNlTG9hZERlbGVnYXRlLm1tCShyZXZpc2lvbiAy NTc3MjEpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Jlc291cmNl TG9hZERlbGVnYXRlLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xODEsOSArMTgxLDE1IEBAIFRFU1Qo UmVzb3VyY2VMb2FkRGVsZWdhdGUsIFJlZGlyZWN0KQogCiAgICAgX19ibG9jayBib29sIGRvbmUg PSBmYWxzZTsKICAgICBhdXRvIHJlc291cmNlTG9hZERlbGVnYXRlID0gYWRvcHROUyhbVGVzdFJl c291cmNlTG9hZERlbGVnYXRlIG5ld10pOwotICAgIFtyZXNvdXJjZUxvYWREZWxlZ2F0ZSBzZXRE aWRQZXJmb3JtSFRUUFJlZGlyZWN0aW9uOl4oV0tXZWJWaWV3ICosIF9XS1Jlc291cmNlTG9hZElu Zm8gKiwgTlNVUkxSZXNwb25zZSAqcmVzcG9uc2UsIE5TVVJMUmVxdWVzdCAqcmVxdWVzdCkgewor ICAgIFtyZXNvdXJjZUxvYWREZWxlZ2F0ZSBzZXREaWRQZXJmb3JtSFRUUFJlZGlyZWN0aW9uOl4o V0tXZWJWaWV3ICosIF9XS1Jlc291cmNlTG9hZEluZm8gKmxvYWRJbmZvLCBOU1VSTFJlc3BvbnNl ICpyZXNwb25zZSwgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0KSB7CiAgICAgICAgIEVYUEVDVF9XS19T VFJFUShyZXNwb25zZS5VUkwucGF0aCwgIi8iKTsKICAgICAgICAgRVhQRUNUX1dLX1NUUkVRKHJl cXVlc3QuVVJMLnBhdGgsICIvcmVkaXJlY3RUYXJnZXQiKTsKKyAgICAgICAgRVhQRUNUX1dLX1NU UkVRKGxvYWRJbmZvLm9yaWdpbmFsVVJMLnBhdGgsICIvIik7CisgICAgICAgIEVYUEVDVF9XS19T VFJFUShsb2FkSW5mby5vcmlnaW5hbEhUVFBNZXRob2QsICJHRVQiKTsKKyAgICB9XTsKKyAgICBb cmVzb3VyY2VMb2FkRGVsZWdhdGUgc2V0RGlkQ29tcGxldGVXaXRoRXJyb3I6XihXS1dlYlZpZXcg KiwgX1dLUmVzb3VyY2VMb2FkSW5mbyAqbG9hZEluZm8sIE5TRXJyb3IgKikgeworICAgICAgICBF WFBFQ1RfV0tfU1RSRVEobG9hZEluZm8ub3JpZ2luYWxVUkwucGF0aCwgIi8iKTsKKyAgICAgICAg RVhQRUNUX1dLX1NUUkVRKGxvYWRJbmZvLm9yaWdpbmFsSFRUUE1ldGhvZCwgIkdFVCIpOwogICAg ICAgICBkb25lID0gdHJ1ZTsKICAgICB9XTsKIApAQCAtMzA5LDEzICszMTUsMTYgQEAgVEVTVChS ZXNvdXJjZUxvYWREZWxlZ2F0ZSwgTG9hZEluZm8pCiAgICAgX1dLUmVzb3VyY2VMb2FkSW5mbyAq b3JpZ2luYWwgPSBsb2FkSW5mb3NbMF0uZ2V0KCk7CiAgICAgTlNFcnJvciAqZXJyb3IgPSBuaWw7 CiAgICAgTlNEYXRhICphcmNoaXZlRGF0YSA9IFtOU0tleWVkQXJjaGl2ZXIgYXJjaGl2ZWREYXRh V2l0aFJvb3RPYmplY3Q6b3JpZ2luYWwgcmVxdWlyaW5nU2VjdXJlQ29kaW5nOllFUyBlcnJvcjom ZXJyb3JdOwotICAgIEVYUEVDVF9FUShhcmNoaXZlRGF0YS5sZW5ndGgsIDI5OXVsbCk7CisgICAg RVhQRUNUX0VRKGFyY2hpdmVEYXRhLmxlbmd0aCwgNTU5dWxsKTsKICAgICBFWFBFQ1RfRkFMU0Uo ZXJyb3IpOwogICAgIF9XS1Jlc291cmNlTG9hZEluZm8gKmRlc2VyaWFsaXplZCA9IFtOU0tleWVk VW5hcmNoaXZlciB1bmFyY2hpdmVkT2JqZWN0T2ZDbGFzczpbX1dLUmVzb3VyY2VMb2FkSW5mbyBj bGFzc10gZnJvbURhdGE6YXJjaGl2ZURhdGEgZXJyb3I6JmVycm9yXTsKICAgICBFWFBFQ1RfRkFM U0UoZXJyb3IpOwogICAgIEVYUEVDVF9UUlVFKGRlc2VyaWFsaXplZC5yZXNvdXJjZUxvYWRJRCA9 PSBvcmlnaW5hbC5yZXNvdXJjZUxvYWRJRCk7CiAgICAgRVhQRUNUX1RSVUUoZGVzZXJpYWxpemVk LmZyYW1lLmZyYW1lSUQgPT0gb3JpZ2luYWwuZnJhbWUuZnJhbWVJRCk7CiAgICAgRVhQRUNUX1RS VUUoZGVzZXJpYWxpemVkLnBhcmVudEZyYW1lLmZyYW1lSUQgPT0gb3JpZ2luYWwucGFyZW50RnJh bWUuZnJhbWVJRCk7CisgICAgRVhQRUNUX1dLX1NUUkVRKGRlc2VyaWFsaXplZC5vcmlnaW5hbFVS TC5hYnNvbHV0ZVN0cmluZywgb3JpZ2luYWwub3JpZ2luYWxVUkwuYWJzb2x1dGVTdHJpbmcpOwor ICAgIEVYUEVDVF9XS19TVFJFUShkZXNlcmlhbGl6ZWQub3JpZ2luYWxIVFRQTWV0aG9kLCBvcmln aW5hbC5vcmlnaW5hbEhUVFBNZXRob2QpOworICAgIEVYUEVDVF9FUShkZXNlcmlhbGl6ZWQuZXZl bnRUaW1lc3RhbXAudGltZUludGVydmFsU2luY2UxOTcwLCBvcmlnaW5hbC5ldmVudFRpbWVzdGFt cC50aW1lSW50ZXJ2YWxTaW5jZTE5NzApOwogfQogCiAjZW5kaWYgLy8gSEFWRShORVRXT1JLX0ZS QU1FV09SSykK