214171 2020-07-09 21:35:04 -0700 Rename createBoxPtr into adoptBoxPtr 2020-07-16 22:20:14 -0700 1 1 1 Unclassified WebKit Web Template Framework WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 calvaris calvaris benjamin cdumez cgarcia cmarcelo darin ews-watchlist gustavo menard pnormand vjaquez webkit-bug-importer oldest_to_newest 1670359 0 calvaris 2020-07-09 21:35:04 -0700 Rename createBoxPtr into adoptBoxPtr 1670361 1 403943 calvaris 2020-07-09 21:38:31 -0700 Created attachment 403943 Patch Address comments by Darin in bug 214144 1670449 2 403968 calvaris 2020-07-10 08:24:01 -0700 Created attachment 403968 Patch I also changed a call to createBoxPtr that was already in trunk. 1670451 3 403968 darin 2020-07-10 08:28:50 -0700 Comment on attachment 403968 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=403968&action=review > Source/WTF/wtf/BoxPtr.h:49 > +template<typename T> BoxPtr<T> adoptBoxPtr(T* ptr) I don’t think adoptBoxPtr is quite the right name. The return value is a BoxPtr, the thing being adopted is not a BoxPtr. Maybe the name needs both the words create (for the BoxPtr) and adopt (for the thing it’s taking)? > Source/WTF/wtf/BoxPtr.h:51 > return BoxPtr<T>::create(ptr); I think Box::create also needs to be renamed for the same reason; as with this function, it takes ownership of a raw pointer and so needs a special name making that clear. 1671038 4 calvaris 2020-07-13 08:31:29 -0700 (In reply to Darin Adler from comment #3) > Comment on attachment 403968 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=403968&action=review > > > Source/WTF/wtf/BoxPtr.h:49 > > +template<typename T> BoxPtr<T> adoptBoxPtr(T* ptr) > > I don’t think adoptBoxPtr is quite the right name. The return value is a > BoxPtr, the thing being adopted is not a BoxPtr. Maybe the name needs both > the words create (for the BoxPtr) and adopt (for the thing it’s taking)? I guess it could be do something like adoptPointerIntoBoxPtr ? I cannot get a better name, but I guess we should iron it out before writing another patch, wdyt? > > Source/WTF/wtf/BoxPtr.h:51 > > return BoxPtr<T>::create(ptr); > > I think Box::create also needs to be renamed for the same reason; as with > this function, it takes ownership of a raw pointer and so needs a special > name making that clear. This create comes from Box class, something I don't think we should rename. 1671050 5 darin 2020-07-13 09:23:52 -0700 (In reply to Xabier Rodríguez Calvar from comment #4) > (In reply to Darin Adler from comment #3) > > I think Box::create also needs to be renamed for the same reason; as with > > this function, it takes ownership of a raw pointer and so needs a special > > name making that clear. > > This create comes from Box class, something I don't think we should rename. Why? What makes the Box class immune to naming considerations? 1671284 6 calvaris 2020-07-13 22:30:17 -0700 (In reply to Darin Adler from comment #5) > (In reply to Xabier Rodríguez Calvar from comment #4) > > (In reply to Darin Adler from comment #3) > > > I think Box::create also needs to be renamed for the same reason; as with > > > this function, it takes ownership of a raw pointer and so needs a special > > > name making that clear. > > > > This create comes from Box class, something I don't think we should rename. > > Why? What makes the Box class immune to naming considerations? Well, yes, we could, but wouldn't recommend it here since Box does create objects in place. 1671429 7 darin 2020-07-14 10:50:56 -0700 (In reply to Xabier Rodríguez Calvar from comment #6) > Well, yes, we could, but wouldn't recommend it here since Box does create > objects in place. Doesn’t that function take ownership of a pointer? How is that "creating an object in place"? 1671430 8 darin 2020-07-14 10:51:29 -0700 (In reply to Darin Adler from comment #7) > (In reply to Xabier Rodríguez Calvar from comment #6) > > Well, yes, we could, but wouldn't recommend it here since Box does create > > objects in place. > > Doesn’t that function take ownership of a pointer? How is that "creating an > object in place"? Oh, OK, I guess not. My bad. I misunderstood. 1672151 9 404453 calvaris 2020-07-16 09:40:32 -0700 Created attachment 404453 Patch Landing this tomorrow morning CEST. 1672400 10 ews-feeder 2020-07-16 22:19:02 -0700 Committed r264499: <https://trac.webkit.org/changeset/264499> All reviewed patches have been landed. Closing bug and clearing flags on attachment 404453. 1672401 11 webkit-bug-importer 2020-07-16 22:20:14 -0700 <rdar://problem/65707686> 403943 2020-07-09 21:38:31 -0700 2020-07-10 08:24:01 -0700 Patch Patch.patch text/plain 6641 calvaris ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggYWExOWViMjllYjNiLi4xNWM1OTIzNTA4ZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIw MjAtMDctMDkgIFhhYmllciBSb2RyaWd1ZXogQ2FsdmFyICA8Y2FsdmFyaXNAaWdhbGlhLmNvbT4K KworICAgICAgICBSZW5hbWUgY3JlYXRlQm94UHRyIGludG8gYWRvcHRCb3hQdHIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDE3MQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd3RmL0JveFB0ci5oOgor ICAgICAgICAoV1RGOjphZG9wdEJveFB0cik6CisgICAgICAgIChXVEY6OmNyZWF0ZUJveFB0cik6 IERlbGV0ZWQuCisKIDIwMjAtMDctMDkgIFhhYmllciBSb2RyaWd1ZXogQ2FsdmFyICA8Y2FsdmFy aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBTaW1wbGlmeSBCb3hQdHI6OmNyZWF0ZQpkaWZmIC0t Z2l0IGEvU291cmNlL1dURi93dGYvQm94UHRyLmggYi9Tb3VyY2UvV1RGL3d0Zi9Cb3hQdHIuaApp bmRleCAwMTQyZWZmYmRmMTAuLmEwMWY4ZDNiNDRjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93 dGYvQm94UHRyLmgKKysrIGIvU291cmNlL1dURi93dGYvQm94UHRyLmgKQEAgLTQ2LDcgKzQ2LDcg QEAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gc3RydWN0IEJveFB0ckRlbGV0ZXIgewogCiB0ZW1wbGF0 ZTx0eXBlbmFtZSBUPiB1c2luZyBCb3hQdHIgPSBCb3g8c3RkOjp1bmlxdWVfcHRyPFQsIEJveFB0 ckRlbGV0ZXI8VD4+PjsKIAotdGVtcGxhdGU8dHlwZW5hbWUgVD4gQm94UHRyPFQ+IGNyZWF0ZUJv eFB0cihUKiBwdHIpCit0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBCb3hQdHI8VD4gYWRvcHRCb3hQdHIo VCogcHRyKQogewogICAgIHJldHVybiBCb3hQdHI8VD46OmNyZWF0ZShwdHIpOwogfQpAQCAtNzUs NSArNzUsNSBAQCB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBib29sIG9wZXJhdG9yIT0oY29uc3QgQm94 UHRyPFQ+JiBsaHMsIGNvbnN0IEJveFB0cjxUPiYgcmhzKQogCiB9IC8vIG5hbWVzcGFjZSBXVEYK IAotdXNpbmcgV1RGOjpjcmVhdGVCb3hQdHI7Cit1c2luZyBXVEY6OmFkb3B0Qm94UHRyOwogdXNp bmcgV1RGOjpCb3hQdHI7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFu Z2VMb2cKaW5kZXggNmJkYTczYjNlM2E3Li4zMmQ1MDA3MmUzYmEgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMC0w Ny0wOSAgWGFiaWVyIFJvZHJpZ3VleiBDYWx2YXIgIDxjYWx2YXJpc0BpZ2FsaWEuY29tPgorCisg ICAgICAgIFJlbmFtZSBjcmVhdGVCb3hQdHIgaW50byBhZG9wdEJveFB0cgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0MTcxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3Rz L1dURi9Cb3hQdHIuY3BwOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisKIDIwMjAt MDctMDkgIEFuZHJlcyBHb256YWxleiAgPGFuZHJlc2dfMjJAYXBwbGUuY29tPgogCiAgICAgICAg IE1ha2UgYWNjZXNzaWJpbGl0eS9NYWMvc2VsZWN0ZWQtdmlzaWJsZS1wb3NpdGlvbi1yYW5nZS5o dG1sIHRpbWUtZGV0ZXJtaW5pc3RpYy4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV1RGL0JveFB0ci5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9Cb3hQ dHIuY3BwCmluZGV4IGE2OTg2N2FhNDU0ZC4uODBiOThjNzRmODRiIDEwMDY0NAotLS0gYS9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9Cb3hQdHIuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV1RGL0JveFB0ci5jcHAKQEAgLTcwLDcgKzcwLDcgQEAgVEVTVChXVEZfQm94 UHRyLCBCYXNpYykKIAogICAgIHsKICAgICAgICAgQm94UHRyTG9nZ2VyKiBhID0gQm94UHRyTG9n Z2VyOjpjcmVhdGUoImEiKTsKLSAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcHRyID0gY3Jl YXRlQm94UHRyKGEpOworICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwdHIgPSBhZG9wdEJv eFB0cihhKTsKICAgICAgICAgRVhQRUNUX0VRKHRydWUsIHN0YXRpY19jYXN0PGJvb2w+KHB0cikp OwogICAgICAgICBFWFBFQ1RfRVEoYSwgcHRyLT5nZXQoKSk7CiAgICAgICAgIEVYUEVDVF9FUShh LT5uYW1lLCAoKnB0ciktPm5hbWUpOwpAQCAtNzksNyArNzksNyBAQCBURVNUKFdURl9Cb3hQdHIs IEJhc2ljKQogCiAgICAgewogICAgICAgICBCb3hQdHJMb2dnZXIqIGEgPSBCb3hQdHJMb2dnZXI6 OmNyZWF0ZSgiYSIpOwotICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwMSA9IGNyZWF0ZUJv eFB0cihhKTsKKyAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcDEgPSBhZG9wdEJveFB0cihh KTsKICAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcDIocDEpOwogICAgICAgICBFWFBFQ1Rf RVEoYSwgcDEtPmdldCgpKTsKICAgICAgICAgRVhQRUNUX0VRKGEsIHAyLT5nZXQoKSk7CkBAIC04 OCw3ICs4OCw3IEBAIFRFU1QoV1RGX0JveFB0ciwgQmFzaWMpCiAKICAgICB7CiAgICAgICAgIEJv eFB0ckxvZ2dlciogYSA9IEJveFB0ckxvZ2dlcjo6Y3JlYXRlKCJhIik7Ci0gICAgICAgIEJveFB0 cjxCb3hQdHJMb2dnZXI+IHAxID0gY3JlYXRlQm94UHRyKGEpOworICAgICAgICBCb3hQdHI8Qm94 UHRyTG9nZ2VyPiBwMSA9IGFkb3B0Qm94UHRyKGEpOwogICAgICAgICBCb3hQdHI8Qm94UHRyTG9n Z2VyPiBwMiA9IHAxOwogICAgICAgICBFWFBFQ1RfRVEoYSwgcDEtPmdldCgpKTsKICAgICAgICAg RVhQRUNUX0VRKGEsIHAyLT5nZXQoKSk7CkBAIC05Nyw3ICs5Nyw3IEBAIFRFU1QoV1RGX0JveFB0 ciwgQmFzaWMpCiAKICAgICB7CiAgICAgICAgIEJveFB0ckxvZ2dlciogYSA9IEJveFB0ckxvZ2dl cjo6Y3JlYXRlKCJhIik7Ci0gICAgICAgIEJveFB0cjxCb3hQdHJMb2dnZXI+IHAxID0gY3JlYXRl Qm94UHRyKGEpOworICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwMSA9IGFkb3B0Qm94UHRy KGEpOwogICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwMiA9IFdURk1vdmUocDEpOwogICAg ICAgICBFWFBFQ1RfRVEoZmFsc2UsIHN0YXRpY19jYXN0PGJvb2w+KHAxKSk7CiAgICAgICAgIEVY UEVDVF9FUShhLCBwMi0+Z2V0KCkpOwpAQCAtMTA2LDcgKzEwNiw3IEBAIFRFU1QoV1RGX0JveFB0 ciwgQmFzaWMpCiAKICAgICB7CiAgICAgICAgIEJveFB0ckxvZ2dlciogYSA9IEJveFB0ckxvZ2dl cjo6Y3JlYXRlKCJhIik7Ci0gICAgICAgIEJveFB0cjxCb3hQdHJMb2dnZXI+IHAxID0gY3JlYXRl Qm94UHRyKGEpOworICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwMSA9IGFkb3B0Qm94UHRy KGEpOwogICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwMihXVEZNb3ZlKHAxKSk7CiAgICAg ICAgIEVYUEVDVF9FUShmYWxzZSwgc3RhdGljX2Nhc3Q8Ym9vbD4ocDEpKTsKICAgICAgICAgRVhQ RUNUX0VRKGEsIHAyLT5nZXQoKSk7CkBAIC0xMTUsNyArMTE1LDcgQEAgVEVTVChXVEZfQm94UHRy LCBCYXNpYykKIAogICAgIHsKICAgICAgICAgQm94UHRyTG9nZ2VyKiBhID0gQm94UHRyTG9nZ2Vy OjpjcmVhdGUoImEiKTsKLSAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcHRyID0gY3JlYXRl Qm94UHRyKGEpOworICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwdHIgPSBhZG9wdEJveFB0 cihhKTsKICAgICAgICAgRVhQRUNUX0VRKGEsIHB0ci0+Z2V0KCkpOwogICAgICAgICBwdHIgPSBu dWxscHRyOwogICAgICAgICBFWFBFQ1RfRVEoZmFsc2UsIHN0YXRpY19jYXN0PGJvb2w+KHB0cikp OwpAQCAtMTI4LDggKzEyOCw4IEBAIFRFU1QoV1RGX0JveFB0ciwgQXNzaWdubWVudCkKICAgICB7 CiAgICAgICAgIEJveFB0ckxvZ2dlciogYSA9IEJveFB0ckxvZ2dlcjo6Y3JlYXRlKCJhIik7CiAg ICAgICAgIEJveFB0ckxvZ2dlciogYiA9IEJveFB0ckxvZ2dlcjo6Y3JlYXRlKCJiIik7Ci0gICAg ICAgIEJveFB0cjxCb3hQdHJMb2dnZXI+IHAxID0gY3JlYXRlQm94UHRyKGEpOwotICAgICAgICBC b3hQdHI8Qm94UHRyTG9nZ2VyPiBwMiA9IGNyZWF0ZUJveFB0cihiKTsKKyAgICAgICAgQm94UHRy PEJveFB0ckxvZ2dlcj4gcDEgPSBhZG9wdEJveFB0cihhKTsKKyAgICAgICAgQm94UHRyPEJveFB0 ckxvZ2dlcj4gcDIgPSBhZG9wdEJveFB0cihiKTsKICAgICAgICAgRVhQRUNUX0VRKGEsIHAxLT5n ZXQoKSk7CiAgICAgICAgIEVYUEVDVF9FUShiLCBwMi0+Z2V0KCkpOwogICAgICAgICBsb2coKSA8 PCAifCAiOwpAQCAtMTQzLDggKzE0Myw4IEBAIFRFU1QoV1RGX0JveFB0ciwgQXNzaWdubWVudCkK ICAgICB7CiAgICAgICAgIEJveFB0ckxvZ2dlciogYSA9IEJveFB0ckxvZ2dlcjo6Y3JlYXRlKCJh Iik7CiAgICAgICAgIEJveFB0ckxvZ2dlciogYiA9IEJveFB0ckxvZ2dlcjo6Y3JlYXRlKCJiIik7 Ci0gICAgICAgIEJveFB0cjxCb3hQdHJMb2dnZXI+IHAxID0gY3JlYXRlQm94UHRyKGEpOwotICAg ICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwMiA9IGNyZWF0ZUJveFB0cihiKTsKKyAgICAgICAg Qm94UHRyPEJveFB0ckxvZ2dlcj4gcDEgPSBhZG9wdEJveFB0cihhKTsKKyAgICAgICAgQm94UHRy PEJveFB0ckxvZ2dlcj4gcDIgPSBhZG9wdEJveFB0cihiKTsKICAgICAgICAgRVhQRUNUX0VRKGEs IHAxLT5nZXQoKSk7CiAgICAgICAgIEVYUEVDVF9FUShiLCBwMi0+Z2V0KCkpOwogICAgICAgICBs b2coKSA8PCAifCAiOwpAQCAtMTU3LDcgKzE1Nyw3IEBAIFRFU1QoV1RGX0JveFB0ciwgQXNzaWdu bWVudCkKIAogICAgIHsKICAgICAgICAgQm94UHRyTG9nZ2VyKiBhID0gQm94UHRyTG9nZ2VyOjpj cmVhdGUoImEiKTsKLSAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcHRyID0gY3JlYXRlQm94 UHRyKGEpOworICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwdHIgPSBhZG9wdEJveFB0cihh KTsKICAgICAgICAgRVhQRUNUX0VRKGEsIHB0ci0+Z2V0KCkpOwogICAgICAgICBsb2coKSA8PCAi fCAiOwogICAgICAgICBJR05PUkVfQ0xBTkdfV0FSTklOR1NfQkVHSU4oInNlbGYtYXNzaWduLW92 ZXJsb2FkZWQiKQpAQCAtMTcwLDcgKzE3MCw3IEBAIFRFU1QoV1RGX0JveFB0ciwgQXNzaWdubWVu dCkKIAogICAgIHsKICAgICAgICAgQm94UHRyTG9nZ2VyKiBhID0gQm94UHRyTG9nZ2VyOjpjcmVh dGUoImEiKTsKLSAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcHRyID0gY3JlYXRlQm94UHRy KGEpOworICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwdHIgPSBhZG9wdEJveFB0cihhKTsK ICAgICAgICAgRVhQRUNUX0VRKGEsIHB0ci0+Z2V0KCkpOwogICAgICAgICBJR05PUkVfQ0xBTkdf V0FSTklOR1NfQkVHSU4oInNlbGYtbW92ZSIpCiAgICAgICAgIHB0ciA9IFdURk1vdmUocHRyKTsK QEAgLTE4NSw4ICsxODUsOCBAQCBURVNUKFdURl9Cb3hQdHIsIE9wZXJhdG9ycykKICAgICB7CiAg ICAgICAgIEJveFB0ckxvZ2dlciogYSA9IEJveFB0ckxvZ2dlcjo6Y3JlYXRlKCJhIik7CiAgICAg ICAgIEJveFB0ckxvZ2dlciogYiA9IEJveFB0ckxvZ2dlcjo6Y3JlYXRlKCJiIik7Ci0gICAgICAg IEJveFB0cjxCb3hQdHJMb2dnZXI+IHAxID0gY3JlYXRlQm94UHRyKGEpOwotICAgICAgICBCb3hQ dHI8Qm94UHRyTG9nZ2VyPiBwMiA9IGNyZWF0ZUJveFB0cihiKTsKKyAgICAgICAgQm94UHRyPEJv eFB0ckxvZ2dlcj4gcDEgPSBhZG9wdEJveFB0cihhKTsKKyAgICAgICAgQm94UHRyPEJveFB0ckxv Z2dlcj4gcDIgPSBhZG9wdEJveFB0cihiKTsKICAgICAgICAgRVhQRUNUX0VRKHAxLCBwMSk7CiAg ICAgICAgIEVYUEVDVF9ORShwMSwgcDIpOwogICAgIH0KQEAgLTE5NCw3ICsxOTQsNyBAQCBURVNU KFdURl9Cb3hQdHIsIE9wZXJhdG9ycykKIAogICAgIHsKICAgICAgICAgQm94UHRyTG9nZ2VyKiBh ID0gQm94UHRyTG9nZ2VyOjpjcmVhdGUoImEiKTsKLSAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dl cj4gcDEgPSBjcmVhdGVCb3hQdHIoYSk7CisgICAgICAgIEJveFB0cjxCb3hQdHJMb2dnZXI+IHAx ID0gYWRvcHRCb3hQdHIoYSk7CiAgICAgICAgIEVYUEVDVF9FUShzdGF0aWNfY2FzdDxib29sPihw MSksIHRydWUpOwogICAgICAgICBFWFBFQ1RfRVEoIXAxLCBmYWxzZSk7CiAgICAgfQpAQCAtMjAz LDcgKzIwMyw3IEBAIFRFU1QoV1RGX0JveFB0ciwgT3BlcmF0b3JzKQogICAgIHsKICAgICAgICAg Qm94UHRyPEJveFB0ckxvZ2dlcj4gZW1wdHk7CiAgICAgICAgIEJveFB0ckxvZ2dlciogYSA9IEJv eFB0ckxvZ2dlcjo6Y3JlYXRlKCJhIik7Ci0gICAgICAgIEJveFB0cjxCb3hQdHJMb2dnZXI+IHAx ID0gY3JlYXRlQm94UHRyKGEpOworICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwMSA9IGFk b3B0Qm94UHRyKGEpOwogICAgICAgICBFWFBFQ1RfTkUoZW1wdHksIHAxKTsKICAgICAgICAgRVhQ RUNUX0VRKGVtcHR5LCBlbXB0eSk7CiAgICAgfQo= 403968 2020-07-10 08:24:01 -0700 2020-07-16 09:40:32 -0700 Patch Patch.patch text/plain 8351 calvaris ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggYjgwYzM5YTkzMDc1Li4wYWFiZmVhMWFmNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MjAtMDctMTAgIFhhYmllciBSb2RyaWd1ZXogQ2FsdmFyICA8Y2FsdmFyaXNAaWdhbGlhLmNvbT4K KworICAgICAgICBSZW5hbWUgY3JlYXRlQm94UHRyIGludG8gYWRvcHRCb3hQdHIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDE3MQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd3RmL0JveFB0ci5oOgor ICAgICAgICAoV1RGOjphZG9wdEJveFB0cik6IFJlbmFtZWQgY3JlYXRlQm94UHRyIGludG8gYWRv cHRCb3hQdHIuCisKIDIwMjAtMDctMTAgIFhhYmllciBSb2RyaWd1ZXogQ2FsdmFyICA8Y2FsdmFy aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1N0cmVhbWVyXVtFTUVdW09wZW5DRE1dIEltcGxl bWVudCBPcGVuQ0RNIHN1cHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0JveFB0ci5o IGIvU291cmNlL1dURi93dGYvQm94UHRyLmgKaW5kZXggMDE0MmVmZmJkZjEwLi5hMDFmOGQzYjQ0 YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0JveFB0ci5oCisrKyBiL1NvdXJjZS9XVEYv d3RmL0JveFB0ci5oCkBAIC00Niw3ICs0Niw3IEBAIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IHN0cnVj dCBCb3hQdHJEZWxldGVyIHsKIAogdGVtcGxhdGU8dHlwZW5hbWUgVD4gdXNpbmcgQm94UHRyID0g Qm94PHN0ZDo6dW5pcXVlX3B0cjxULCBCb3hQdHJEZWxldGVyPFQ+Pj47CiAKLXRlbXBsYXRlPHR5 cGVuYW1lIFQ+IEJveFB0cjxUPiBjcmVhdGVCb3hQdHIoVCogcHRyKQordGVtcGxhdGU8dHlwZW5h bWUgVD4gQm94UHRyPFQ+IGFkb3B0Qm94UHRyKFQqIHB0cikKIHsKICAgICByZXR1cm4gQm94UHRy PFQ+OjpjcmVhdGUocHRyKTsKIH0KQEAgLTc1LDUgKzc1LDUgQEAgdGVtcGxhdGU8dHlwZW5hbWUg VD4gYm9vbCBvcGVyYXRvciE9KGNvbnN0IEJveFB0cjxUPiYgbGhzLCBjb25zdCBCb3hQdHI8VD4m IHJocykKIAogfSAvLyBuYW1lc3BhY2UgV1RGCiAKLXVzaW5nIFdURjo6Y3JlYXRlQm94UHRyOwor dXNpbmcgV1RGOjphZG9wdEJveFB0cjsKIHVzaW5nIFdURjo6Qm94UHRyOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4 IDkxNDU1ZDVjODllMi4uODA2ZmQ4NWZjZDU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMjAtMDctMTAgIFhhYmllciBSb2RyaWd1ZXogQ2FsdmFyICA8Y2FsdmFyaXNAaWdhbGlhLmNv bT4KKworICAgICAgICBSZW5hbWUgY3JlYXRlQm94UHRyIGludG8gYWRvcHRCb3hQdHIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDE3MQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL2VtZS9DRE1Qcm94eVRodW5kZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q0RNUHJveHlUaHVuZGVyOjpnZXREZWNyeXB0aW9uU2Vzc2lvbiBjb25zdCk6IFVzZWQgdGhl CisgICAgICAgIHJlbmFtZWQgZnVuY3Rpb24uCisKIDIwMjAtMDctMTAgIFhhYmllciBSb2RyaWd1 ZXogQ2FsdmFyICA8Y2FsdmFyaXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1N0cmVhbWVyXVtF TUVdW09wZW5DRE1dIEltcGxlbWVudCBPcGVuQ0RNIHN1cHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvQ0RNUHJveHlUaHVuZGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvQ0RN UHJveHlUaHVuZGVyLmNwcAppbmRleCBhMWY4ZmZlOTVlNmMuLjZmYTU4YjE3ZmY1YiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9DRE1Q cm94eVRodW5kZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dz dHJlYW1lci9lbWUvQ0RNUHJveHlUaHVuZGVyLmNwcApAQCAtNjQsNyArNjQsNyBAQCBCb3hQdHI8 T3BlbkNETVNlc3Npb24+IENETVByb3h5VGh1bmRlcjo6Z2V0RGVjcnlwdGlvblNlc3Npb24oY29u c3QgRGVjcnlwdGlvbkNvbgogICAgIEJveFB0cjxPcGVuQ0RNU2Vzc2lvbj4ga2V5VmFsdWUgPSBX VEY6OmdldDxCb3hQdHI8T3BlbkNETVNlc3Npb24+PihrZXlEYXRhKTsKIAogICAgIGlmICgha2V5 VmFsdWUpIHsKLSAgICAgICAga2V5VmFsdWUgPSBjcmVhdGVCb3hQdHIob3BlbmNkbV9nZXRfc3lz dGVtX3Nlc3Npb24oJnN0YXRpY19jYXN0PGNvbnN0IENETUluc3RhbmNlVGh1bmRlcio+KGluc3Rh bmNlKCkpLT50aHVuZGVyU3lzdGVtKCksIGtleUlELmRhdGEoKSwKKyAgICAgICAga2V5VmFsdWUg PSBhZG9wdEJveFB0cihvcGVuY2RtX2dldF9zeXN0ZW1fc2Vzc2lvbigmc3RhdGljX2Nhc3Q8Y29u c3QgQ0RNSW5zdGFuY2VUaHVuZGVyKj4oaW5zdGFuY2UoKSktPnRodW5kZXJTeXN0ZW0oKSwga2V5 SUQuZGF0YSgpLAogICAgICAgICAgICAga2V5SUQuc2l6ZSgpLCBzX2xpY2Vuc2VLZXlSZXNwb25z ZVRpbWVvdXQubWlsbGlzZWNvbmRzQXM8dWludDMyX3Q+KCkpKTsKICAgICAgICAgQVNTRVJUKGtl eVZhbHVlKTsKICAgICAgICAgLy8gdGFrZVZhbHVlSWZEaWZmZXJlbnQgdGFrZXMgYW5kIHItdmFs dWUgcmVmIG9mCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cK aW5kZXggYWZlZmM1NWM4ZTY2Li5kZGU5ZGNmNTE0Y2MgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5n ZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMC0wNy0xMCAg WGFiaWVyIFJvZHJpZ3VleiBDYWx2YXIgIDxjYWx2YXJpc0BpZ2FsaWEuY29tPgorCisgICAgICAg IFJlbmFtZSBjcmVhdGVCb3hQdHIgaW50byBhZG9wdEJveFB0cgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0MTcxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9C b3hQdHIuY3BwOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6IFVzZWQgdGhlIHJlbmFt ZWQgZnVuY3Rpb24uCisKIDIwMjAtMDctMTAgIFhhYmllciBSb2RyaWd1ZXogQ2FsdmFyICA8Y2Fs dmFyaXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1N0cmVhbWVyXVtFTUVdW09wZW5DRE1dIElt cGxlbWVudCBPcGVuQ0RNIHN1cHBvcnQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV1RGL0JveFB0ci5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9Cb3hQ dHIuY3BwCmluZGV4IGE2OTg2N2FhNDU0ZC4uODBiOThjNzRmODRiIDEwMDY0NAotLS0gYS9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9Cb3hQdHIuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV1RGL0JveFB0ci5jcHAKQEAgLTcwLDcgKzcwLDcgQEAgVEVTVChXVEZfQm94 UHRyLCBCYXNpYykKIAogICAgIHsKICAgICAgICAgQm94UHRyTG9nZ2VyKiBhID0gQm94UHRyTG9n Z2VyOjpjcmVhdGUoImEiKTsKLSAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcHRyID0gY3Jl YXRlQm94UHRyKGEpOworICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwdHIgPSBhZG9wdEJv eFB0cihhKTsKICAgICAgICAgRVhQRUNUX0VRKHRydWUsIHN0YXRpY19jYXN0PGJvb2w+KHB0cikp OwogICAgICAgICBFWFBFQ1RfRVEoYSwgcHRyLT5nZXQoKSk7CiAgICAgICAgIEVYUEVDVF9FUShh LT5uYW1lLCAoKnB0ciktPm5hbWUpOwpAQCAtNzksNyArNzksNyBAQCBURVNUKFdURl9Cb3hQdHIs IEJhc2ljKQogCiAgICAgewogICAgICAgICBCb3hQdHJMb2dnZXIqIGEgPSBCb3hQdHJMb2dnZXI6 OmNyZWF0ZSgiYSIpOwotICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwMSA9IGNyZWF0ZUJv eFB0cihhKTsKKyAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcDEgPSBhZG9wdEJveFB0cihh KTsKICAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcDIocDEpOwogICAgICAgICBFWFBFQ1Rf RVEoYSwgcDEtPmdldCgpKTsKICAgICAgICAgRVhQRUNUX0VRKGEsIHAyLT5nZXQoKSk7CkBAIC04 OCw3ICs4OCw3IEBAIFRFU1QoV1RGX0JveFB0ciwgQmFzaWMpCiAKICAgICB7CiAgICAgICAgIEJv eFB0ckxvZ2dlciogYSA9IEJveFB0ckxvZ2dlcjo6Y3JlYXRlKCJhIik7Ci0gICAgICAgIEJveFB0 cjxCb3hQdHJMb2dnZXI+IHAxID0gY3JlYXRlQm94UHRyKGEpOworICAgICAgICBCb3hQdHI8Qm94 UHRyTG9nZ2VyPiBwMSA9IGFkb3B0Qm94UHRyKGEpOwogICAgICAgICBCb3hQdHI8Qm94UHRyTG9n Z2VyPiBwMiA9IHAxOwogICAgICAgICBFWFBFQ1RfRVEoYSwgcDEtPmdldCgpKTsKICAgICAgICAg RVhQRUNUX0VRKGEsIHAyLT5nZXQoKSk7CkBAIC05Nyw3ICs5Nyw3IEBAIFRFU1QoV1RGX0JveFB0 ciwgQmFzaWMpCiAKICAgICB7CiAgICAgICAgIEJveFB0ckxvZ2dlciogYSA9IEJveFB0ckxvZ2dl cjo6Y3JlYXRlKCJhIik7Ci0gICAgICAgIEJveFB0cjxCb3hQdHJMb2dnZXI+IHAxID0gY3JlYXRl Qm94UHRyKGEpOworICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwMSA9IGFkb3B0Qm94UHRy KGEpOwogICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwMiA9IFdURk1vdmUocDEpOwogICAg ICAgICBFWFBFQ1RfRVEoZmFsc2UsIHN0YXRpY19jYXN0PGJvb2w+KHAxKSk7CiAgICAgICAgIEVY UEVDVF9FUShhLCBwMi0+Z2V0KCkpOwpAQCAtMTA2LDcgKzEwNiw3IEBAIFRFU1QoV1RGX0JveFB0 ciwgQmFzaWMpCiAKICAgICB7CiAgICAgICAgIEJveFB0ckxvZ2dlciogYSA9IEJveFB0ckxvZ2dl cjo6Y3JlYXRlKCJhIik7Ci0gICAgICAgIEJveFB0cjxCb3hQdHJMb2dnZXI+IHAxID0gY3JlYXRl Qm94UHRyKGEpOworICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwMSA9IGFkb3B0Qm94UHRy KGEpOwogICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwMihXVEZNb3ZlKHAxKSk7CiAgICAg ICAgIEVYUEVDVF9FUShmYWxzZSwgc3RhdGljX2Nhc3Q8Ym9vbD4ocDEpKTsKICAgICAgICAgRVhQ RUNUX0VRKGEsIHAyLT5nZXQoKSk7CkBAIC0xMTUsNyArMTE1LDcgQEAgVEVTVChXVEZfQm94UHRy LCBCYXNpYykKIAogICAgIHsKICAgICAgICAgQm94UHRyTG9nZ2VyKiBhID0gQm94UHRyTG9nZ2Vy OjpjcmVhdGUoImEiKTsKLSAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcHRyID0gY3JlYXRl Qm94UHRyKGEpOworICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwdHIgPSBhZG9wdEJveFB0 cihhKTsKICAgICAgICAgRVhQRUNUX0VRKGEsIHB0ci0+Z2V0KCkpOwogICAgICAgICBwdHIgPSBu dWxscHRyOwogICAgICAgICBFWFBFQ1RfRVEoZmFsc2UsIHN0YXRpY19jYXN0PGJvb2w+KHB0cikp OwpAQCAtMTI4LDggKzEyOCw4IEBAIFRFU1QoV1RGX0JveFB0ciwgQXNzaWdubWVudCkKICAgICB7 CiAgICAgICAgIEJveFB0ckxvZ2dlciogYSA9IEJveFB0ckxvZ2dlcjo6Y3JlYXRlKCJhIik7CiAg ICAgICAgIEJveFB0ckxvZ2dlciogYiA9IEJveFB0ckxvZ2dlcjo6Y3JlYXRlKCJiIik7Ci0gICAg ICAgIEJveFB0cjxCb3hQdHJMb2dnZXI+IHAxID0gY3JlYXRlQm94UHRyKGEpOwotICAgICAgICBC b3hQdHI8Qm94UHRyTG9nZ2VyPiBwMiA9IGNyZWF0ZUJveFB0cihiKTsKKyAgICAgICAgQm94UHRy PEJveFB0ckxvZ2dlcj4gcDEgPSBhZG9wdEJveFB0cihhKTsKKyAgICAgICAgQm94UHRyPEJveFB0 ckxvZ2dlcj4gcDIgPSBhZG9wdEJveFB0cihiKTsKICAgICAgICAgRVhQRUNUX0VRKGEsIHAxLT5n ZXQoKSk7CiAgICAgICAgIEVYUEVDVF9FUShiLCBwMi0+Z2V0KCkpOwogICAgICAgICBsb2coKSA8 PCAifCAiOwpAQCAtMTQzLDggKzE0Myw4IEBAIFRFU1QoV1RGX0JveFB0ciwgQXNzaWdubWVudCkK ICAgICB7CiAgICAgICAgIEJveFB0ckxvZ2dlciogYSA9IEJveFB0ckxvZ2dlcjo6Y3JlYXRlKCJh Iik7CiAgICAgICAgIEJveFB0ckxvZ2dlciogYiA9IEJveFB0ckxvZ2dlcjo6Y3JlYXRlKCJiIik7 Ci0gICAgICAgIEJveFB0cjxCb3hQdHJMb2dnZXI+IHAxID0gY3JlYXRlQm94UHRyKGEpOwotICAg ICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwMiA9IGNyZWF0ZUJveFB0cihiKTsKKyAgICAgICAg Qm94UHRyPEJveFB0ckxvZ2dlcj4gcDEgPSBhZG9wdEJveFB0cihhKTsKKyAgICAgICAgQm94UHRy PEJveFB0ckxvZ2dlcj4gcDIgPSBhZG9wdEJveFB0cihiKTsKICAgICAgICAgRVhQRUNUX0VRKGEs IHAxLT5nZXQoKSk7CiAgICAgICAgIEVYUEVDVF9FUShiLCBwMi0+Z2V0KCkpOwogICAgICAgICBs b2coKSA8PCAifCAiOwpAQCAtMTU3LDcgKzE1Nyw3IEBAIFRFU1QoV1RGX0JveFB0ciwgQXNzaWdu bWVudCkKIAogICAgIHsKICAgICAgICAgQm94UHRyTG9nZ2VyKiBhID0gQm94UHRyTG9nZ2VyOjpj cmVhdGUoImEiKTsKLSAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcHRyID0gY3JlYXRlQm94 UHRyKGEpOworICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwdHIgPSBhZG9wdEJveFB0cihh KTsKICAgICAgICAgRVhQRUNUX0VRKGEsIHB0ci0+Z2V0KCkpOwogICAgICAgICBsb2coKSA8PCAi fCAiOwogICAgICAgICBJR05PUkVfQ0xBTkdfV0FSTklOR1NfQkVHSU4oInNlbGYtYXNzaWduLW92 ZXJsb2FkZWQiKQpAQCAtMTcwLDcgKzE3MCw3IEBAIFRFU1QoV1RGX0JveFB0ciwgQXNzaWdubWVu dCkKIAogICAgIHsKICAgICAgICAgQm94UHRyTG9nZ2VyKiBhID0gQm94UHRyTG9nZ2VyOjpjcmVh dGUoImEiKTsKLSAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcHRyID0gY3JlYXRlQm94UHRy KGEpOworICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwdHIgPSBhZG9wdEJveFB0cihhKTsK ICAgICAgICAgRVhQRUNUX0VRKGEsIHB0ci0+Z2V0KCkpOwogICAgICAgICBJR05PUkVfQ0xBTkdf V0FSTklOR1NfQkVHSU4oInNlbGYtbW92ZSIpCiAgICAgICAgIHB0ciA9IFdURk1vdmUocHRyKTsK QEAgLTE4NSw4ICsxODUsOCBAQCBURVNUKFdURl9Cb3hQdHIsIE9wZXJhdG9ycykKICAgICB7CiAg ICAgICAgIEJveFB0ckxvZ2dlciogYSA9IEJveFB0ckxvZ2dlcjo6Y3JlYXRlKCJhIik7CiAgICAg ICAgIEJveFB0ckxvZ2dlciogYiA9IEJveFB0ckxvZ2dlcjo6Y3JlYXRlKCJiIik7Ci0gICAgICAg IEJveFB0cjxCb3hQdHJMb2dnZXI+IHAxID0gY3JlYXRlQm94UHRyKGEpOwotICAgICAgICBCb3hQ dHI8Qm94UHRyTG9nZ2VyPiBwMiA9IGNyZWF0ZUJveFB0cihiKTsKKyAgICAgICAgQm94UHRyPEJv eFB0ckxvZ2dlcj4gcDEgPSBhZG9wdEJveFB0cihhKTsKKyAgICAgICAgQm94UHRyPEJveFB0ckxv Z2dlcj4gcDIgPSBhZG9wdEJveFB0cihiKTsKICAgICAgICAgRVhQRUNUX0VRKHAxLCBwMSk7CiAg ICAgICAgIEVYUEVDVF9ORShwMSwgcDIpOwogICAgIH0KQEAgLTE5NCw3ICsxOTQsNyBAQCBURVNU KFdURl9Cb3hQdHIsIE9wZXJhdG9ycykKIAogICAgIHsKICAgICAgICAgQm94UHRyTG9nZ2VyKiBh ID0gQm94UHRyTG9nZ2VyOjpjcmVhdGUoImEiKTsKLSAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dl cj4gcDEgPSBjcmVhdGVCb3hQdHIoYSk7CisgICAgICAgIEJveFB0cjxCb3hQdHJMb2dnZXI+IHAx ID0gYWRvcHRCb3hQdHIoYSk7CiAgICAgICAgIEVYUEVDVF9FUShzdGF0aWNfY2FzdDxib29sPihw MSksIHRydWUpOwogICAgICAgICBFWFBFQ1RfRVEoIXAxLCBmYWxzZSk7CiAgICAgfQpAQCAtMjAz LDcgKzIwMyw3IEBAIFRFU1QoV1RGX0JveFB0ciwgT3BlcmF0b3JzKQogICAgIHsKICAgICAgICAg Qm94UHRyPEJveFB0ckxvZ2dlcj4gZW1wdHk7CiAgICAgICAgIEJveFB0ckxvZ2dlciogYSA9IEJv eFB0ckxvZ2dlcjo6Y3JlYXRlKCJhIik7Ci0gICAgICAgIEJveFB0cjxCb3hQdHJMb2dnZXI+IHAx ID0gY3JlYXRlQm94UHRyKGEpOworICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwMSA9IGFk b3B0Qm94UHRyKGEpOwogICAgICAgICBFWFBFQ1RfTkUoZW1wdHksIHAxKTsKICAgICAgICAgRVhQ RUNUX0VRKGVtcHR5LCBlbXB0eSk7CiAgICAgfQo= 404453 2020-07-16 09:40:32 -0700 2020-07-16 22:19:03 -0700 Patch Patch.patch text/plain 8373 calvaris ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggZGYxYmY0NzJkNmVlLi5mYjI3ZGIyMjgxMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MjAtMDctMTYgIFhhYmllciBSb2RyaWd1ZXogQ2FsdmFyICA8Y2FsdmFyaXNAaWdhbGlhLmNvbT4K KworICAgICAgICBSZW5hbWUgY3JlYXRlQm94UHRyIGludG8gYWRvcHRCb3hQdHIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDE3MQorCisgICAgICAg IFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgICogd3RmL0JveFB0ci5oOgorICAg ICAgICAoV1RGOjphZG9wdEluQm94UHRyKToKKwogMjAyMC0wNy0xMyAgS2VpdGggTWlsbGVyICA8 a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBDbGVhbiB1cCBTb3VyY2VQcm92aWRl ciBhbmQgYWRkIGNhbGxlciByZWxhdGl2ZSBsb2FkIHNjcmlwdCB0byBqc2MuY3BwCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV1RGL3d0Zi9Cb3hQdHIuaCBiL1NvdXJjZS9XVEYvd3RmL0JveFB0ci5oCmlu ZGV4IDAxNDJlZmZiZGYxMC4uOTg0ODgwMmQxMDc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0 Zi9Cb3hQdHIuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9Cb3hQdHIuaApAQCAtNDYsNyArNDYsNyBA QCB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBzdHJ1Y3QgQm94UHRyRGVsZXRlciB7CiAKIHRlbXBsYXRl PHR5cGVuYW1lIFQ+IHVzaW5nIEJveFB0ciA9IEJveDxzdGQ6OnVuaXF1ZV9wdHI8VCwgQm94UHRy RGVsZXRlcjxUPj4+OwogCi10ZW1wbGF0ZTx0eXBlbmFtZSBUPiBCb3hQdHI8VD4gY3JlYXRlQm94 UHRyKFQqIHB0cikKK3RlbXBsYXRlPHR5cGVuYW1lIFQ+IEJveFB0cjxUPiBhZG9wdEluQm94UHRy KFQqIHB0cikKIHsKICAgICByZXR1cm4gQm94UHRyPFQ+OjpjcmVhdGUocHRyKTsKIH0KQEAgLTc1 LDUgKzc1LDUgQEAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gYm9vbCBvcGVyYXRvciE9KGNvbnN0IEJv eFB0cjxUPiYgbGhzLCBjb25zdCBCb3hQdHI8VD4mIHJocykKIAogfSAvLyBuYW1lc3BhY2UgV1RG CiAKLXVzaW5nIFdURjo6Y3JlYXRlQm94UHRyOwordXNpbmcgV1RGOjphZG9wdEluQm94UHRyOwog dXNpbmcgV1RGOjpCb3hQdHI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWFlMGNiNWUyZTFkLi5hZmJhMzVkMmQz Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMC0wNy0xNiAgWGFiaWVyIFJvZHJp Z3VleiBDYWx2YXIgIDxjYWx2YXJpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFJlbmFtZSBjcmVh dGVCb3hQdHIgaW50byBhZG9wdEJveFB0cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE0MTcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRs ZXIuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBqdXN0IGEgcmVuYW1lLgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9DRE1Qcm94eVRodW5kZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Q0RNUHJveHlUaHVuZGVyOjpnZXREZWNyeXB0aW9uU2Vzc2lvbiBjb25z dCk6IFVzZWQgdGhlCisgICAgICAgIHJlbmFtZWQgZnVuY3Rpb24uCisKIDIwMjAtMDctMTQgIENs YXJrIFdhbmcgIDxjbGFya193YW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGVkIEF1ZGlv Q29udGV4dCBjb25zdHJ1Y3RvciBhY2NvcmRpbmcgdG8gc3BlYwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9DRE1Qcm94eVRodW5kZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9DRE1Q cm94eVRodW5kZXIuY3BwCmluZGV4IGExZjhmZmU5NWU2Yy4uNmYyOWM1ZjJmOWMwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL0NETVBy b3h5VGh1bmRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL2VtZS9DRE1Qcm94eVRodW5kZXIuY3BwCkBAIC02NCw3ICs2NCw3IEBAIEJveFB0cjxP cGVuQ0RNU2Vzc2lvbj4gQ0RNUHJveHlUaHVuZGVyOjpnZXREZWNyeXB0aW9uU2Vzc2lvbihjb25z dCBEZWNyeXB0aW9uQ29uCiAgICAgQm94UHRyPE9wZW5DRE1TZXNzaW9uPiBrZXlWYWx1ZSA9IFdU Rjo6Z2V0PEJveFB0cjxPcGVuQ0RNU2Vzc2lvbj4+KGtleURhdGEpOwogCiAgICAgaWYgKCFrZXlW YWx1ZSkgewotICAgICAgICBrZXlWYWx1ZSA9IGNyZWF0ZUJveFB0cihvcGVuY2RtX2dldF9zeXN0 ZW1fc2Vzc2lvbigmc3RhdGljX2Nhc3Q8Y29uc3QgQ0RNSW5zdGFuY2VUaHVuZGVyKj4oaW5zdGFu Y2UoKSktPnRodW5kZXJTeXN0ZW0oKSwga2V5SUQuZGF0YSgpLAorICAgICAgICBrZXlWYWx1ZSA9 IGFkb3B0SW5Cb3hQdHIob3BlbmNkbV9nZXRfc3lzdGVtX3Nlc3Npb24oJnN0YXRpY19jYXN0PGNv bnN0IENETUluc3RhbmNlVGh1bmRlcio+KGluc3RhbmNlKCkpLT50aHVuZGVyU3lzdGVtKCksIGtl eUlELmRhdGEoKSwKICAgICAgICAgICAgIGtleUlELnNpemUoKSwgc19saWNlbnNlS2V5UmVzcG9u c2VUaW1lb3V0Lm1pbGxpc2Vjb25kc0FzPHVpbnQzMl90PigpKSk7CiAgICAgICAgIEFTU0VSVChr ZXlWYWx1ZSk7CiAgICAgICAgIC8vIHRha2VWYWx1ZUlmRGlmZmVyZW50IHRha2VzIGFuZCByLXZh bHVlIHJlZiBvZgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9n CmluZGV4IGYyYmJjMzNkYWE3My4uZTM1YTJjOTkwNDg1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFu Z2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDctMTYg IFhhYmllciBSb2RyaWd1ZXogQ2FsdmFyICA8Y2FsdmFyaXNAaWdhbGlhLmNvbT4KKworICAgICAg ICBSZW5hbWUgY3JlYXRlQm94UHRyIGludG8gYWRvcHRCb3hQdHIKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDE3MQorCisgICAgICAgIFJldmlld2Vk IGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvQm94 UHRyLmNwcDoKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOiBVc2VkIHRoZSByZW5hbWVk IGZ1bmN0aW9uLgorCiAyMDIwLTA3LTE0ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxl LmNvbT4KIAogICAgICAgICBBZGQgdHZPUyBhbmQgd2F0Y2hPUyBzdXBwb3J0IHRvIGJ1aWx0LXBy b2R1Y3QtYXJjaGl2ZQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYv Qm94UHRyLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL0JveFB0ci5jcHAKaW5k ZXggYTY5ODY3YWE0NTRkLi5kNWRlMGJhYTY3NWMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV1RGL0JveFB0ci5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XVEYvQm94UHRyLmNwcApAQCAtNzAsNyArNzAsNyBAQCBURVNUKFdURl9Cb3hQdHIsIEJhc2lj KQogCiAgICAgewogICAgICAgICBCb3hQdHJMb2dnZXIqIGEgPSBCb3hQdHJMb2dnZXI6OmNyZWF0 ZSgiYSIpOwotICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwdHIgPSBjcmVhdGVCb3hQdHIo YSk7CisgICAgICAgIEJveFB0cjxCb3hQdHJMb2dnZXI+IHB0ciA9IGFkb3B0SW5Cb3hQdHIoYSk7 CiAgICAgICAgIEVYUEVDVF9FUSh0cnVlLCBzdGF0aWNfY2FzdDxib29sPihwdHIpKTsKICAgICAg ICAgRVhQRUNUX0VRKGEsIHB0ci0+Z2V0KCkpOwogICAgICAgICBFWFBFQ1RfRVEoYS0+bmFtZSwg KCpwdHIpLT5uYW1lKTsKQEAgLTc5LDcgKzc5LDcgQEAgVEVTVChXVEZfQm94UHRyLCBCYXNpYykK IAogICAgIHsKICAgICAgICAgQm94UHRyTG9nZ2VyKiBhID0gQm94UHRyTG9nZ2VyOjpjcmVhdGUo ImEiKTsKLSAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcDEgPSBjcmVhdGVCb3hQdHIoYSk7 CisgICAgICAgIEJveFB0cjxCb3hQdHJMb2dnZXI+IHAxID0gYWRvcHRJbkJveFB0cihhKTsKICAg ICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcDIocDEpOwogICAgICAgICBFWFBFQ1RfRVEoYSwg cDEtPmdldCgpKTsKICAgICAgICAgRVhQRUNUX0VRKGEsIHAyLT5nZXQoKSk7CkBAIC04OCw3ICs4 OCw3IEBAIFRFU1QoV1RGX0JveFB0ciwgQmFzaWMpCiAKICAgICB7CiAgICAgICAgIEJveFB0ckxv Z2dlciogYSA9IEJveFB0ckxvZ2dlcjo6Y3JlYXRlKCJhIik7Ci0gICAgICAgIEJveFB0cjxCb3hQ dHJMb2dnZXI+IHAxID0gY3JlYXRlQm94UHRyKGEpOworICAgICAgICBCb3hQdHI8Qm94UHRyTG9n Z2VyPiBwMSA9IGFkb3B0SW5Cb3hQdHIoYSk7CiAgICAgICAgIEJveFB0cjxCb3hQdHJMb2dnZXI+ IHAyID0gcDE7CiAgICAgICAgIEVYUEVDVF9FUShhLCBwMS0+Z2V0KCkpOwogICAgICAgICBFWFBF Q1RfRVEoYSwgcDItPmdldCgpKTsKQEAgLTk3LDcgKzk3LDcgQEAgVEVTVChXVEZfQm94UHRyLCBC YXNpYykKIAogICAgIHsKICAgICAgICAgQm94UHRyTG9nZ2VyKiBhID0gQm94UHRyTG9nZ2VyOjpj cmVhdGUoImEiKTsKLSAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcDEgPSBjcmVhdGVCb3hQ dHIoYSk7CisgICAgICAgIEJveFB0cjxCb3hQdHJMb2dnZXI+IHAxID0gYWRvcHRJbkJveFB0cihh KTsKICAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcDIgPSBXVEZNb3ZlKHAxKTsKICAgICAg ICAgRVhQRUNUX0VRKGZhbHNlLCBzdGF0aWNfY2FzdDxib29sPihwMSkpOwogICAgICAgICBFWFBF Q1RfRVEoYSwgcDItPmdldCgpKTsKQEAgLTEwNiw3ICsxMDYsNyBAQCBURVNUKFdURl9Cb3hQdHIs IEJhc2ljKQogCiAgICAgewogICAgICAgICBCb3hQdHJMb2dnZXIqIGEgPSBCb3hQdHJMb2dnZXI6 OmNyZWF0ZSgiYSIpOwotICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwMSA9IGNyZWF0ZUJv eFB0cihhKTsKKyAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcDEgPSBhZG9wdEluQm94UHRy KGEpOwogICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwMihXVEZNb3ZlKHAxKSk7CiAgICAg ICAgIEVYUEVDVF9FUShmYWxzZSwgc3RhdGljX2Nhc3Q8Ym9vbD4ocDEpKTsKICAgICAgICAgRVhQ RUNUX0VRKGEsIHAyLT5nZXQoKSk7CkBAIC0xMTUsNyArMTE1LDcgQEAgVEVTVChXVEZfQm94UHRy LCBCYXNpYykKIAogICAgIHsKICAgICAgICAgQm94UHRyTG9nZ2VyKiBhID0gQm94UHRyTG9nZ2Vy OjpjcmVhdGUoImEiKTsKLSAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcHRyID0gY3JlYXRl Qm94UHRyKGEpOworICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwdHIgPSBhZG9wdEluQm94 UHRyKGEpOwogICAgICAgICBFWFBFQ1RfRVEoYSwgcHRyLT5nZXQoKSk7CiAgICAgICAgIHB0ciA9 IG51bGxwdHI7CiAgICAgICAgIEVYUEVDVF9FUShmYWxzZSwgc3RhdGljX2Nhc3Q8Ym9vbD4ocHRy KSk7CkBAIC0xMjgsOCArMTI4LDggQEAgVEVTVChXVEZfQm94UHRyLCBBc3NpZ25tZW50KQogICAg IHsKICAgICAgICAgQm94UHRyTG9nZ2VyKiBhID0gQm94UHRyTG9nZ2VyOjpjcmVhdGUoImEiKTsK ICAgICAgICAgQm94UHRyTG9nZ2VyKiBiID0gQm94UHRyTG9nZ2VyOjpjcmVhdGUoImIiKTsKLSAg ICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcDEgPSBjcmVhdGVCb3hQdHIoYSk7Ci0gICAgICAg IEJveFB0cjxCb3hQdHJMb2dnZXI+IHAyID0gY3JlYXRlQm94UHRyKGIpOworICAgICAgICBCb3hQ dHI8Qm94UHRyTG9nZ2VyPiBwMSA9IGFkb3B0SW5Cb3hQdHIoYSk7CisgICAgICAgIEJveFB0cjxC b3hQdHJMb2dnZXI+IHAyID0gYWRvcHRJbkJveFB0cihiKTsKICAgICAgICAgRVhQRUNUX0VRKGEs IHAxLT5nZXQoKSk7CiAgICAgICAgIEVYUEVDVF9FUShiLCBwMi0+Z2V0KCkpOwogICAgICAgICBs b2coKSA8PCAifCAiOwpAQCAtMTQzLDggKzE0Myw4IEBAIFRFU1QoV1RGX0JveFB0ciwgQXNzaWdu bWVudCkKICAgICB7CiAgICAgICAgIEJveFB0ckxvZ2dlciogYSA9IEJveFB0ckxvZ2dlcjo6Y3Jl YXRlKCJhIik7CiAgICAgICAgIEJveFB0ckxvZ2dlciogYiA9IEJveFB0ckxvZ2dlcjo6Y3JlYXRl KCJiIik7Ci0gICAgICAgIEJveFB0cjxCb3hQdHJMb2dnZXI+IHAxID0gY3JlYXRlQm94UHRyKGEp OwotICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwMiA9IGNyZWF0ZUJveFB0cihiKTsKKyAg ICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcDEgPSBhZG9wdEluQm94UHRyKGEpOworICAgICAg ICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwMiA9IGFkb3B0SW5Cb3hQdHIoYik7CiAgICAgICAgIEVY UEVDVF9FUShhLCBwMS0+Z2V0KCkpOwogICAgICAgICBFWFBFQ1RfRVEoYiwgcDItPmdldCgpKTsK ICAgICAgICAgbG9nKCkgPDwgInwgIjsKQEAgLTE1Nyw3ICsxNTcsNyBAQCBURVNUKFdURl9Cb3hQ dHIsIEFzc2lnbm1lbnQpCiAKICAgICB7CiAgICAgICAgIEJveFB0ckxvZ2dlciogYSA9IEJveFB0 ckxvZ2dlcjo6Y3JlYXRlKCJhIik7Ci0gICAgICAgIEJveFB0cjxCb3hQdHJMb2dnZXI+IHB0ciA9 IGNyZWF0ZUJveFB0cihhKTsKKyAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcHRyID0gYWRv cHRJbkJveFB0cihhKTsKICAgICAgICAgRVhQRUNUX0VRKGEsIHB0ci0+Z2V0KCkpOwogICAgICAg ICBsb2coKSA8PCAifCAiOwogICAgICAgICBJR05PUkVfQ0xBTkdfV0FSTklOR1NfQkVHSU4oInNl bGYtYXNzaWduLW92ZXJsb2FkZWQiKQpAQCAtMTcwLDcgKzE3MCw3IEBAIFRFU1QoV1RGX0JveFB0 ciwgQXNzaWdubWVudCkKIAogICAgIHsKICAgICAgICAgQm94UHRyTG9nZ2VyKiBhID0gQm94UHRy TG9nZ2VyOjpjcmVhdGUoImEiKTsKLSAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcHRyID0g Y3JlYXRlQm94UHRyKGEpOworICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwdHIgPSBhZG9w dEluQm94UHRyKGEpOwogICAgICAgICBFWFBFQ1RfRVEoYSwgcHRyLT5nZXQoKSk7CiAgICAgICAg IElHTk9SRV9DTEFOR19XQVJOSU5HU19CRUdJTigic2VsZi1tb3ZlIikKICAgICAgICAgcHRyID0g V1RGTW92ZShwdHIpOwpAQCAtMTg1LDggKzE4NSw4IEBAIFRFU1QoV1RGX0JveFB0ciwgT3BlcmF0 b3JzKQogICAgIHsKICAgICAgICAgQm94UHRyTG9nZ2VyKiBhID0gQm94UHRyTG9nZ2VyOjpjcmVh dGUoImEiKTsKICAgICAgICAgQm94UHRyTG9nZ2VyKiBiID0gQm94UHRyTG9nZ2VyOjpjcmVhdGUo ImIiKTsKLSAgICAgICAgQm94UHRyPEJveFB0ckxvZ2dlcj4gcDEgPSBjcmVhdGVCb3hQdHIoYSk7 Ci0gICAgICAgIEJveFB0cjxCb3hQdHJMb2dnZXI+IHAyID0gY3JlYXRlQm94UHRyKGIpOworICAg ICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBwMSA9IGFkb3B0SW5Cb3hQdHIoYSk7CisgICAgICAg IEJveFB0cjxCb3hQdHJMb2dnZXI+IHAyID0gYWRvcHRJbkJveFB0cihiKTsKICAgICAgICAgRVhQ RUNUX0VRKHAxLCBwMSk7CiAgICAgICAgIEVYUEVDVF9ORShwMSwgcDIpOwogICAgIH0KQEAgLTE5 NCw3ICsxOTQsNyBAQCBURVNUKFdURl9Cb3hQdHIsIE9wZXJhdG9ycykKIAogICAgIHsKICAgICAg ICAgQm94UHRyTG9nZ2VyKiBhID0gQm94UHRyTG9nZ2VyOjpjcmVhdGUoImEiKTsKLSAgICAgICAg Qm94UHRyPEJveFB0ckxvZ2dlcj4gcDEgPSBjcmVhdGVCb3hQdHIoYSk7CisgICAgICAgIEJveFB0 cjxCb3hQdHJMb2dnZXI+IHAxID0gYWRvcHRJbkJveFB0cihhKTsKICAgICAgICAgRVhQRUNUX0VR KHN0YXRpY19jYXN0PGJvb2w+KHAxKSwgdHJ1ZSk7CiAgICAgICAgIEVYUEVDVF9FUSghcDEsIGZh bHNlKTsKICAgICB9CkBAIC0yMDMsNyArMjAzLDcgQEAgVEVTVChXVEZfQm94UHRyLCBPcGVyYXRv cnMpCiAgICAgewogICAgICAgICBCb3hQdHI8Qm94UHRyTG9nZ2VyPiBlbXB0eTsKICAgICAgICAg Qm94UHRyTG9nZ2VyKiBhID0gQm94UHRyTG9nZ2VyOjpjcmVhdGUoImEiKTsKLSAgICAgICAgQm94 UHRyPEJveFB0ckxvZ2dlcj4gcDEgPSBjcmVhdGVCb3hQdHIoYSk7CisgICAgICAgIEJveFB0cjxC b3hQdHJMb2dnZXI+IHAxID0gYWRvcHRJbkJveFB0cihhKTsKICAgICAgICAgRVhQRUNUX05FKGVt cHR5LCBwMSk7CiAgICAgICAgIEVYUEVDVF9FUShlbXB0eSwgZW1wdHkpOwogICAgIH0K