225818 2021-05-14 12:05:38 -0700 [WebKitTestRunner] Forward WebContent termination reason 2021-05-14 22:02:15 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard cdumez webkit-bug-importer oldest_to_newest 1760162 0 jbedard 2021-05-14 12:05:38 -0700 We should print the reason a WebContent process was terminated to aid in debugging. 1760163 1 webkit-bug-importer 2021-05-14 12:05:56 -0700 <rdar://problem/78027164> 1760164 2 428645 jbedard 2021-05-14 12:09:18 -0700 Created attachment 428645 Patch 1760182 3 428645 cdumez 2021-05-14 13:26:44 -0700 Comment on attachment 428645 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=428645&action=review > Tools/WebKitTestRunner/TestController.cpp:2163 > + fprintf(stderr, "Terminating %s (pid %ld) ", webProcessName(), static_cast<long>(pid)); Isn't this going to look confusing? """ Terminating WebProcess (pid: 123) because the process crashed #CRASHED - WebProcess (pid: 123) """ Why are we saying we are terminating a process when the process actually crashed? Maybe it should be something like: fprintf(stderr, "%s terminated (pid %ld) ", webProcessName(), static_cast<long>(pid)); > Tools/WebKitTestRunner/TestController.cpp:2182 > + return; Note that you are not calling fflush() in this early return case even though you printed something. > Tools/WebKitTestRunner/TestController.cpp:2185 > fflush(stderr); Note the call to fflush() here. 1760189 4 428645 jbedard 2021-05-14 13:42:23 -0700 Comment on attachment 428645 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=428645&action=review >> Tools/WebKitTestRunner/TestController.cpp:2163 >> + fprintf(stderr, "Terminating %s (pid %ld) ", webProcessName(), static_cast<long>(pid)); > > Isn't this going to look confusing? > """ > Terminating WebProcess (pid: 123) because the process crashed > #CRASHED - WebProcess (pid: 123) > """ > > Why are we saying we are terminating a process when the process actually crashed? > > Maybe it should be something like: > fprintf(stderr, "%s terminated (pid %ld) ", webProcessName(), static_cast<long>(pid)); The #CRASHED string will not show up in run-webkit-test's output, that's a control statement that triggers some logic in webkitpy about collecting crashes. I was trying to match the name of the API I'm good with your phrasing, though, indicating the termination has already occurred. >> Tools/WebKitTestRunner/TestController.cpp:2182 >> + return; > > Note that you are not calling fflush() in this early return case even though you printed something. My rationale here is that the processDidCrash callback was not triggered in the case originally, and the whole reason we call flush is because we may call exit at the end of this function. That being said, I suppose flush can't do any harm in the early return case. 1760193 5 428654 jbedard 2021-05-14 13:51:45 -0700 Created attachment 428654 Patch 1760195 6 428654 cdumez 2021-05-14 13:53:00 -0700 Comment on attachment 428654 Patch r=me 1760302 7 428687 jbedard 2021-05-14 17:01:14 -0700 Created attachment 428687 Patch 1760377 8 ews-feeder 2021-05-14 22:02:14 -0700 Committed r277533 (237761@main): <https://commits.webkit.org/237761@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428687. 428645 2021-05-14 12:09:18 -0700 2021-05-14 14:20:55 -0700 Patch bug-225818-20210514120917.patch text/plain 6158 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NDg4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjc3OTljYjRlYTNlMTI1YjM2NWU3NmQ2OTYwOGI2YTAw OGY2ZDA5ZC4uZWUxZmQwYzI1ZWIxZGI3Y2RiMGY2NGQxNTQ0MDQ0NTExNDkwZjBjMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDIxLTA1LTE0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbV2ViS2l0VGVzdFJ1bm5lcl0gRm9yd2FyZCBXZWJDb250ZW50IHRlcm1pbmF0aW9u IHJlYXNvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI1ODE4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83ODAyNzE2ND4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvVGVz dENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6Y3JlYXRlT3Ro ZXJQYWdlKTogVXNlIGRpZFRlcm1pbmF0ZSBjYWxsYmFjayBpbnN0ZWFkIG9mIGRpZENyYXNoIGNh bGxiYWNrLgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6Y3JlYXRlV2ViVmlld1dpdGhP cHRpb25zKTogRGl0dG8uCisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjp3ZWJQcm9jZXNz RGlkVGVybWluYXRlKToKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OnByb2Nlc3NEaWRD cmFzaCk6IFJlbmFtZWQgd2ViUHJvY2Vzc0RpZFRlcm1pbmF0ZS4KKyAgICAgICAgKiBXZWJLaXRU ZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmg6IFJlcGxhY2UgcHJvY2Vzc0RpZENyYXNoIHdpdGgg d2ViUHJvY2Vzc0RpZFRlcm1pbmF0ZS4KKwogMjAyMS0wNS0xNCAgQ2FybG9zIEdhcmNpYSBDYW1w b3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gW0dUS10gRml4 IG1ha2UgZGlzdGNoZWNrCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RD b250cm9sbGVyLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3Bw CmluZGV4IGUwNjY3MDBmM2NlNmFhZGE5YWIyMWEzNjRiMGEyYmJjZTQyOGFlNDguLjFkOGQwMjkz M2E4YmI0Y2FiNDc1OGIyNTNjZDIxYTZhYWI0MWY2NDQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvVGVzdENvbnRyb2xsZXIuY3BwCkBAIC00NjgsMTMgKzQ2OCwxMyBAQCBXS1BhZ2VSZWYgVGVz dENvbnRyb2xsZXI6OmNyZWF0ZU90aGVyUGFnZShQbGF0Zm9ybVdlYlZpZXcqIHBhcmVudFZpZXcs IFdLUGFnZUNvbgogICAgICAgICBudWxscHRyLCAvLyByZW5kZXJpbmdQcm9ncmVzc0RpZENoYW5n ZQogICAgICAgICBjYW5BdXRoZW50aWNhdGVBZ2FpbnN0UHJvdGVjdGlvblNwYWNlLAogICAgICAg ICBkaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2UsCi0gICAgICAgIHByb2Nlc3NEaWRD cmFzaCwKKyAgICAgICAgbnVsbHB0ciwgLy8gd2ViUHJvY2Vzc0RpZENyYXNoCiAgICAgICAgIGNv cHlXZWJDcnlwdG9NYXN0ZXJLZXksCiAgICAgICAgIGRpZEJlZ2luTmF2aWdhdGlvbkdlc3R1cmUs CiAgICAgICAgIHdpbGxFbmROYXZpZ2F0aW9uR2VzdHVyZSwKICAgICAgICAgZGlkRW5kTmF2aWdh dGlvbkdlc3R1cmUsCiAgICAgICAgIGRpZFJlbW92ZU5hdmlnYXRpb25HZXN0dXJlU25hcHNob3Qs Ci0gICAgICAgIG51bGxwdHIsIC8vIHdlYlByb2Nlc3NEaWRUZXJtaW5hdGUKKyAgICAgICAgd2Vi UHJvY2Vzc0RpZFRlcm1pbmF0ZSwgLy8gd2ViUHJvY2Vzc0RpZFRlcm1pbmF0ZQogICAgICAgICBu dWxscHRyLCAvLyBjb250ZW50UnVsZUxpc3ROb3RpZmljYXRpb24KICAgICAgICAgY29weVNpZ25l ZFB1YmxpY0tleUFuZENoYWxsZW5nZVN0cmluZywKICAgICAgICAgbmF2aWdhdGlvbkFjdGlvbkRp ZEJlY29tZURvd25sb2FkLApAQCAtODEwLDEzICs4MTAsMTMgQEAgdm9pZCBUZXN0Q29udHJvbGxl cjo6Y3JlYXRlV2ViVmlld1dpdGhPcHRpb25zKGNvbnN0IFRlc3RPcHRpb25zJiBvcHRpb25zKQog ICAgICAgICBudWxscHRyLCAvLyByZW5kZXJpbmdQcm9ncmVzc0RpZENoYW5nZQogICAgICAgICBj YW5BdXRoZW50aWNhdGVBZ2FpbnN0UHJvdGVjdGlvblNwYWNlLAogICAgICAgICBkaWRSZWNlaXZl QXV0aGVudGljYXRpb25DaGFsbGVuZ2UsCi0gICAgICAgIHByb2Nlc3NEaWRDcmFzaCwKKyAgICAg ICAgbnVsbHB0ciwKICAgICAgICAgY29weVdlYkNyeXB0b01hc3RlcktleSwKICAgICAgICAgZGlk QmVnaW5OYXZpZ2F0aW9uR2VzdHVyZSwKICAgICAgICAgd2lsbEVuZE5hdmlnYXRpb25HZXN0dXJl LAogICAgICAgICBkaWRFbmROYXZpZ2F0aW9uR2VzdHVyZSwKICAgICAgICAgZGlkUmVtb3ZlTmF2 aWdhdGlvbkdlc3R1cmVTbmFwc2hvdCwKLSAgICAgICAgbnVsbHB0ciwgLy8gd2ViUHJvY2Vzc0Rp ZFRlcm1pbmF0ZQorICAgICAgICB3ZWJQcm9jZXNzRGlkVGVybWluYXRlLCAvLyB3ZWJQcm9jZXNz RGlkVGVybWluYXRlCiAgICAgICAgIG51bGxwdHIsIC8vIGNvbnRlbnRSdWxlTGlzdE5vdGlmaWNh dGlvbgogICAgICAgICBjb3B5U2lnbmVkUHVibGljS2V5QW5kQ2hhbGxlbmdlU3RyaW5nLAogICAg ICAgICBuYXZpZ2F0aW9uQWN0aW9uRGlkQmVjb21lRG93bmxvYWQsCkBAIC0xODYyLDkgKzE4NjIs OSBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpkaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVu Z2UoV0tQYWdlUmVmIHBhZ2UsIFdLQXV0aGVudAogICAgIHN0YXRpY19jYXN0PFRlc3RDb250cm9s bGVyKj4oY29uc3RfY2FzdDx2b2lkKj4oY2xpZW50SW5mbykpLT5kaWRSZWNlaXZlQXV0aGVudGlj YXRpb25DaGFsbGVuZ2UocGFnZSwgLypmcmFtZSwqLyBhdXRoZW50aWNhdGlvbkNoYWxsZW5nZSk7 CiB9CiAKLXZvaWQgVGVzdENvbnRyb2xsZXI6OnByb2Nlc3NEaWRDcmFzaChXS1BhZ2VSZWYgcGFn ZSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKK3ZvaWQgVGVzdENvbnRyb2xsZXI6OndlYlByb2Nl c3NEaWRUZXJtaW5hdGUoV0tQYWdlUmVmIHBhZ2UsIFdLUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29u IHJlYXNvbiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHsKLSAgICBzdGF0aWNfY2FzdDxUZXN0 Q29udHJvbGxlcio+KGNvbnN0X2Nhc3Q8dm9pZCo+KGNsaWVudEluZm8pKS0+cHJvY2Vzc0RpZENy YXNoKCk7CisgICAgc3RhdGljX2Nhc3Q8VGVzdENvbnRyb2xsZXIqPihjb25zdF9jYXN0PHZvaWQq PihjbGllbnRJbmZvKSktPndlYlByb2Nlc3NEaWRUZXJtaW5hdGUocmVhc29uKTsKIH0KIAogdm9p ZCBUZXN0Q29udHJvbGxlcjo6ZGlkQmVnaW5OYXZpZ2F0aW9uR2VzdHVyZShXS1BhZ2VSZWYgcGFn ZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbykKQEAgLTIxNTQsMTIgKzIxNTQsMzMgQEAgdm9pZCBU ZXN0Q29udHJvbGxlcjo6ZG93bmxvYWREaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2Uo V0tEb3dubG9hZFJlZiwgV0sKICAgICBzdGF0aWNfY2FzdDxUZXN0Q29udHJvbGxlcio+KGNvbnN0 X2Nhc3Q8dm9pZCo+KGNsaWVudEluZm8pKS0+ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxl bmdlKG51bGxwdHIsIGF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKTsKIH0KIAotdm9pZCBUZXN0Q29u dHJvbGxlcjo6cHJvY2Vzc0RpZENyYXNoKCkKK3ZvaWQgVGVzdENvbnRyb2xsZXI6OndlYlByb2Nl c3NEaWRUZXJtaW5hdGUoV0tQcm9jZXNzVGVybWluYXRpb25SZWFzb24gcmVhc29uKQogewogICAg IC8vIFRoaXMgZnVuY3Rpb24gY2FuIGJlIGNhbGxlZCBtdWx0aXBsZSB0aW1lcyB3aGVuIGNyYXNo IGxvZ3MgYXJlIGJlaW5nIHNhdmVkIG9uIFdpbmRvd3MsIHNvCiAgICAgLy8gZW5zdXJlIHdlIG9u bHkgcHJpbnQgdGhlIGNyYXNoZWQgbWVzc2FnZSBvbmNlLgogICAgIGlmICghbV9kaWRQcmludFdl YlByb2Nlc3NDcmFzaGVkTWVzc2FnZSkgewogICAgICAgICBwaWRfdCBwaWQgPSBXS1BhZ2VHZXRQ cm9jZXNzSWRlbnRpZmllcihtX21haW5XZWJWaWV3LT5wYWdlKCkpOworICAgICAgICBmcHJpbnRm KHN0ZGVyciwgIlRlcm1pbmF0aW5nICVzIChwaWQgJWxkKSAiLCB3ZWJQcm9jZXNzTmFtZSgpLCBz dGF0aWNfY2FzdDxsb25nPihwaWQpKTsKKyAgICAgICAgc3dpdGNoIChyZWFzb24pIHsKKyAgICAg ICAgY2FzZSBrV0tQcm9jZXNzVGVybWluYXRpb25SZWFzb25FeGNlZWRlZE1lbW9yeUxpbWl0Ogor ICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJiZWNhdXNlIHRoZSBtZW1vcnkgbGltaXQgd2Fz IGV4Y2VlZGVkXG4iKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIGtXS1Byb2Nl c3NUZXJtaW5hdGlvblJlYXNvbkV4Y2VlZGVkQ1BVTGltaXQ6CisgICAgICAgICAgICBmcHJpbnRm KHN0ZGVyciwgImJlY2F1c2UgdGhlIGNwdSBsaW1pdCB3YXMgZXhjZWVkZWRcbiIpOworICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgIGNhc2Uga1dLUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uUmVx dWVzdGVkQnlDbGllbnQ6CisgICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgImJlY2F1c2UgdGhl IGNsaWVudCByZXF1ZXN0ZWRcbiIpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2Ug a1dLUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uQ3Jhc2g6CisgICAgICAgICAgICBmcHJpbnRmKHN0 ZGVyciwgImJlY2F1c2UgdGhlIHByb2Nlc3MgY3Jhc2hlZFxuIik7CisgICAgICAgICAgICBicmVh azsKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiZm9yIGFu IHVua25vd24gcmVhc29uXG4iKTsKKyAgICAgICAgfQorCisgICAgICAgIGlmIChyZWFzb24gPT0g a1dLUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uUmVxdWVzdGVkQnlDbGllbnQpCisgICAgICAgICAg ICByZXR1cm47CisKICAgICAgICAgZnByaW50ZihzdGRlcnIsICIjQ1JBU0hFRCAtICVzIChwaWQg JWxkKVxuIiwgd2ViUHJvY2Vzc05hbWUoKSwgc3RhdGljX2Nhc3Q8bG9uZz4ocGlkKSk7CiAgICAg ICAgIGZmbHVzaChzdGRlcnIpOwogICAgICAgICBtX2RpZFByaW50V2ViUHJvY2Vzc0NyYXNoZWRN ZXNzYWdlID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENv bnRyb2xsZXIuaCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuaAppbmRl eCBiZGU2YjBlZDc3NWRjZjIzOWQ4ZWIxZDJjYjZmMWI3NjcyYTZhOWE5Li5jMTQ5NWEyMDBiZmI4 N2Y0ZDYxZTdjZWMzOWQ5M2FmMTEyYWUxYzBjIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL1Rlc3RDb250cm9sbGVyLmgKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0 Q29udHJvbGxlci5oCkBAIC00NjksOCArNDY5LDggQEAgcHJpdmF0ZToKICAgICBib29sIGRvd25s b2FkRGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0VG9VUkwoV0tEb3dubG9hZFJlZiwgV0tVUkxSZXF1 ZXN0UmVmKTsKICAgICBzdGF0aWMgdm9pZCBkb3dubG9hZERpZFJlY2VpdmVBdXRoZW50aWNhdGlv bkNoYWxsZW5nZShXS0Rvd25sb2FkUmVmLCBXS0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlUmVmLCBj b25zdCB2b2lkICpjbGllbnRJbmZvKTsKICAgICAKLSAgICBzdGF0aWMgdm9pZCBwcm9jZXNzRGlk Q3Jhc2goV0tQYWdlUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKLSAgICB2b2lkIHByb2Nl c3NEaWRDcmFzaCgpOworICAgIHN0YXRpYyB2b2lkIHdlYlByb2Nlc3NEaWRUZXJtaW5hdGUoV0tQ YWdlUmVmLCAgV0tQcm9jZXNzVGVybWluYXRpb25SZWFzb24sIGNvbnN0IHZvaWQqIGNsaWVudElu Zm8pOworICAgIHZvaWQgd2ViUHJvY2Vzc0RpZFRlcm1pbmF0ZShXS1Byb2Nlc3NUZXJtaW5hdGlv blJlYXNvbik7CiAKICAgICBzdGF0aWMgdm9pZCBkaWRCZWdpbk5hdmlnYXRpb25HZXN0dXJlKFdL UGFnZVJlZiwgY29uc3Qgdm9pZCopOwogICAgIHN0YXRpYyB2b2lkIHdpbGxFbmROYXZpZ2F0aW9u R2VzdHVyZShXS1BhZ2VSZWYsIFdLQmFja0ZvcndhcmRMaXN0SXRlbVJlZiwgY29uc3Qgdm9pZCop Owo= 428654 2021-05-14 13:51:45 -0700 2021-05-14 17:01:12 -0700 Patch bug-225818-20210514135144.patch text/plain 5909 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3NzUwMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDIxLTA1LTE0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbV2ViS2l0VGVzdFJ1bm5lcl0gRm9yd2FyZCBXZWJDb250ZW50IHRlcm1p bmF0aW9uIHJlYXNvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjI1ODE4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83ODAyNzE2ND4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYktpdFRlc3RSdW5u ZXIvVGVzdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6Y3Jl YXRlT3RoZXJQYWdlKTogVXNlIGRpZFRlcm1pbmF0ZSBjYWxsYmFjayBpbnN0ZWFkIG9mIGRpZENy YXNoIGNhbGxiYWNrLgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6Y3JlYXRlV2ViVmll d1dpdGhPcHRpb25zKTogRGl0dG8uCisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjp3ZWJQ cm9jZXNzRGlkVGVybWluYXRlKToKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OnByb2Nl c3NEaWRDcmFzaCk6IFJlbmFtZWQgd2ViUHJvY2Vzc0RpZFRlcm1pbmF0ZS4KKyAgICAgICAgKiBX ZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmg6IFJlcGxhY2UgcHJvY2Vzc0RpZENyYXNo IHdpdGggd2ViUHJvY2Vzc0RpZFRlcm1pbmF0ZS4KKwogMjAyMS0wNS0xNCAgRGV2aW4gUm91c3Nv ICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gY29udGV4dG1lbnUgaGludHMg Y2FuIGJlIGNsaXBwZWQgYnkgdGhlIFdLV2ViVmlldwpJbmRleDogVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9UZXN0Q29udHJvbGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9UZXN0Q29udHJvbGxlci5jcHAJKHJldmlzaW9uIDI3NzUwMykKKysrIFRvb2xzL1dlYktp dFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NjgsMTMg KzQ2OCwxMyBAQCBXS1BhZ2VSZWYgVGVzdENvbnRyb2xsZXI6OmNyZWF0ZU90aGVyUGFnCiAgICAg ICAgIG51bGxwdHIsIC8vIHJlbmRlcmluZ1Byb2dyZXNzRGlkQ2hhbmdlCiAgICAgICAgIGNhbkF1 dGhlbnRpY2F0ZUFnYWluc3RQcm90ZWN0aW9uU3BhY2UsCiAgICAgICAgIGRpZFJlY2VpdmVBdXRo ZW50aWNhdGlvbkNoYWxsZW5nZSwKLSAgICAgICAgcHJvY2Vzc0RpZENyYXNoLAorICAgICAgICBu dWxscHRyLCAvLyB3ZWJQcm9jZXNzRGlkQ3Jhc2gKICAgICAgICAgY29weVdlYkNyeXB0b01hc3Rl cktleSwKICAgICAgICAgZGlkQmVnaW5OYXZpZ2F0aW9uR2VzdHVyZSwKICAgICAgICAgd2lsbEVu ZE5hdmlnYXRpb25HZXN0dXJlLAogICAgICAgICBkaWRFbmROYXZpZ2F0aW9uR2VzdHVyZSwKICAg ICAgICAgZGlkUmVtb3ZlTmF2aWdhdGlvbkdlc3R1cmVTbmFwc2hvdCwKLSAgICAgICAgbnVsbHB0 ciwgLy8gd2ViUHJvY2Vzc0RpZFRlcm1pbmF0ZQorICAgICAgICB3ZWJQcm9jZXNzRGlkVGVybWlu YXRlLCAvLyB3ZWJQcm9jZXNzRGlkVGVybWluYXRlCiAgICAgICAgIG51bGxwdHIsIC8vIGNvbnRl bnRSdWxlTGlzdE5vdGlmaWNhdGlvbgogICAgICAgICBjb3B5U2lnbmVkUHVibGljS2V5QW5kQ2hh bGxlbmdlU3RyaW5nLAogICAgICAgICBuYXZpZ2F0aW9uQWN0aW9uRGlkQmVjb21lRG93bmxvYWQs CkBAIC04MTAsMTMgKzgxMCwxMyBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpjcmVhdGVXZWJWaWV3 V2l0aE9wCiAgICAgICAgIG51bGxwdHIsIC8vIHJlbmRlcmluZ1Byb2dyZXNzRGlkQ2hhbmdlCiAg ICAgICAgIGNhbkF1dGhlbnRpY2F0ZUFnYWluc3RQcm90ZWN0aW9uU3BhY2UsCiAgICAgICAgIGRp ZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSwKLSAgICAgICAgcHJvY2Vzc0RpZENyYXNo LAorICAgICAgICBudWxscHRyLAogICAgICAgICBjb3B5V2ViQ3J5cHRvTWFzdGVyS2V5LAogICAg ICAgICBkaWRCZWdpbk5hdmlnYXRpb25HZXN0dXJlLAogICAgICAgICB3aWxsRW5kTmF2aWdhdGlv bkdlc3R1cmUsCiAgICAgICAgIGRpZEVuZE5hdmlnYXRpb25HZXN0dXJlLAogICAgICAgICBkaWRS ZW1vdmVOYXZpZ2F0aW9uR2VzdHVyZVNuYXBzaG90LAotICAgICAgICBudWxscHRyLCAvLyB3ZWJQ cm9jZXNzRGlkVGVybWluYXRlCisgICAgICAgIHdlYlByb2Nlc3NEaWRUZXJtaW5hdGUsIC8vIHdl YlByb2Nlc3NEaWRUZXJtaW5hdGUKICAgICAgICAgbnVsbHB0ciwgLy8gY29udGVudFJ1bGVMaXN0 Tm90aWZpY2F0aW9uCiAgICAgICAgIGNvcHlTaWduZWRQdWJsaWNLZXlBbmRDaGFsbGVuZ2VTdHJp bmcsCiAgICAgICAgIG5hdmlnYXRpb25BY3Rpb25EaWRCZWNvbWVEb3dubG9hZCwKQEAgLTE4NjIs OSArMTg2Miw5IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OmRpZFJlY2VpdmVBdXRoZW50aWMKICAg ICBzdGF0aWNfY2FzdDxUZXN0Q29udHJvbGxlcio+KGNvbnN0X2Nhc3Q8dm9pZCo+KGNsaWVudElu Zm8pKS0+ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKHBhZ2UsIC8qZnJhbWUsKi8g YXV0aGVudGljYXRpb25DaGFsbGVuZ2UpOwogfQogCi12b2lkIFRlc3RDb250cm9sbGVyOjpwcm9j ZXNzRGlkQ3Jhc2goV0tQYWdlUmVmIHBhZ2UsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCit2b2lk IFRlc3RDb250cm9sbGVyOjp3ZWJQcm9jZXNzRGlkVGVybWluYXRlKFdLUGFnZVJlZiBwYWdlLCBX S1Byb2Nlc3NUZXJtaW5hdGlvblJlYXNvbiByZWFzb24sIGNvbnN0IHZvaWQqIGNsaWVudEluZm8p CiB7Ci0gICAgc3RhdGljX2Nhc3Q8VGVzdENvbnRyb2xsZXIqPihjb25zdF9jYXN0PHZvaWQqPihj bGllbnRJbmZvKSktPnByb2Nlc3NEaWRDcmFzaCgpOworICAgIHN0YXRpY19jYXN0PFRlc3RDb250 cm9sbGVyKj4oY29uc3RfY2FzdDx2b2lkKj4oY2xpZW50SW5mbykpLT53ZWJQcm9jZXNzRGlkVGVy bWluYXRlKHJlYXNvbik7CiB9CiAKIHZvaWQgVGVzdENvbnRyb2xsZXI6OmRpZEJlZ2luTmF2aWdh dGlvbkdlc3R1cmUoV0tQYWdlUmVmIHBhZ2UsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pCkBAIC0y MTU0LDEyICsyMTU0LDM1IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OmRvd25sb2FkRGlkUmVjZWl2 ZUEKICAgICBzdGF0aWNfY2FzdDxUZXN0Q29udHJvbGxlcio+KGNvbnN0X2Nhc3Q8dm9pZCo+KGNs aWVudEluZm8pKS0+ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKG51bGxwdHIsIGF1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKTsKIH0KIAotdm9pZCBUZXN0Q29udHJvbGxlcjo6cHJvY2Vz c0RpZENyYXNoKCkKK3ZvaWQgVGVzdENvbnRyb2xsZXI6OndlYlByb2Nlc3NEaWRUZXJtaW5hdGUo V0tQcm9jZXNzVGVybWluYXRpb25SZWFzb24gcmVhc29uKQogewogICAgIC8vIFRoaXMgZnVuY3Rp b24gY2FuIGJlIGNhbGxlZCBtdWx0aXBsZSB0aW1lcyB3aGVuIGNyYXNoIGxvZ3MgYXJlIGJlaW5n IHNhdmVkIG9uIFdpbmRvd3MsIHNvCiAgICAgLy8gZW5zdXJlIHdlIG9ubHkgcHJpbnQgdGhlIGNy YXNoZWQgbWVzc2FnZSBvbmNlLgogICAgIGlmICghbV9kaWRQcmludFdlYlByb2Nlc3NDcmFzaGVk TWVzc2FnZSkgewogICAgICAgICBwaWRfdCBwaWQgPSBXS1BhZ2VHZXRQcm9jZXNzSWRlbnRpZmll cihtX21haW5XZWJWaWV3LT5wYWdlKCkpOworICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIiVzIHRl cm1pbmF0ZWQgKHBpZCAlbGQpICIsIHdlYlByb2Nlc3NOYW1lKCksIHN0YXRpY19jYXN0PGxvbmc+ KHBpZCkpOworICAgICAgICBzd2l0Y2ggKHJlYXNvbikgeworICAgICAgICBjYXNlIGtXS1Byb2Nl c3NUZXJtaW5hdGlvblJlYXNvbkV4Y2VlZGVkTWVtb3J5TGltaXQ6CisgICAgICAgICAgICBmcHJp bnRmKHN0ZGVyciwgImJlY2F1c2UgdGhlIG1lbW9yeSBsaW1pdCB3YXMgZXhjZWVkZWRcbiIpOwor ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2Uga1dLUHJvY2Vzc1Rlcm1pbmF0aW9uUmVh c29uRXhjZWVkZWRDUFVMaW1pdDoKKyAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiYmVjYXVz ZSB0aGUgY3B1IGxpbWl0IHdhcyBleGNlZWRlZFxuIik7CisgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgY2FzZSBrV0tQcm9jZXNzVGVybWluYXRpb25SZWFzb25SZXF1ZXN0ZWRCeUNsaWVudDoK KyAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiYmVjYXVzZSB0aGUgY2xpZW50IHJlcXVlc3Rl ZFxuIik7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBrV0tQcm9jZXNzVGVybWlu YXRpb25SZWFzb25DcmFzaDoKKyAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiYmVjYXVzZSB0 aGUgcHJvY2VzcyBjcmFzaGVkXG4iKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBkZWZh dWx0OgorICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJmb3IgYW4gdW5rbm93biByZWFzb25c biIpOworICAgICAgICB9CisKKyAgICAgICAgaWYgKHJlYXNvbiA9PSBrV0tQcm9jZXNzVGVybWlu YXRpb25SZWFzb25SZXF1ZXN0ZWRCeUNsaWVudCkgeworICAgICAgICAgICAgZmZsdXNoKHN0ZGVy cik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKwogICAgICAgICBmcHJpbnRmKHN0 ZGVyciwgIiNDUkFTSEVEIC0gJXMgKHBpZCAlbGQpXG4iLCB3ZWJQcm9jZXNzTmFtZSgpLCBzdGF0 aWNfY2FzdDxsb25nPihwaWQpKTsKICAgICAgICAgZmZsdXNoKHN0ZGVycik7CiAgICAgICAgIG1f ZGlkUHJpbnRXZWJQcm9jZXNzQ3Jhc2hlZE1lc3NhZ2UgPSB0cnVlOwpJbmRleDogVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1dlYktp dFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuaAkocmV2aXNpb24gMjc3NTAzKQorKysgVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC00Njks OCArNDY5LDggQEAgcHJpdmF0ZToKICAgICBib29sIGRvd25sb2FkRGlkUmVjZWl2ZVNlcnZlclJl ZGlyZWN0VG9VUkwoV0tEb3dubG9hZFJlZiwgV0tVUkxSZXF1ZXN0UmVmKTsKICAgICBzdGF0aWMg dm9pZCBkb3dubG9hZERpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZShXS0Rvd25sb2Fk UmVmLCBXS0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlUmVmLCBjb25zdCB2b2lkICpjbGllbnRJbmZv KTsKICAgICAKLSAgICBzdGF0aWMgdm9pZCBwcm9jZXNzRGlkQ3Jhc2goV0tQYWdlUmVmLCBjb25z dCB2b2lkKiBjbGllbnRJbmZvKTsKLSAgICB2b2lkIHByb2Nlc3NEaWRDcmFzaCgpOworICAgIHN0 YXRpYyB2b2lkIHdlYlByb2Nlc3NEaWRUZXJtaW5hdGUoV0tQYWdlUmVmLCAgV0tQcm9jZXNzVGVy bWluYXRpb25SZWFzb24sIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOworICAgIHZvaWQgd2ViUHJv Y2Vzc0RpZFRlcm1pbmF0ZShXS1Byb2Nlc3NUZXJtaW5hdGlvblJlYXNvbik7CiAKICAgICBzdGF0 aWMgdm9pZCBkaWRCZWdpbk5hdmlnYXRpb25HZXN0dXJlKFdLUGFnZVJlZiwgY29uc3Qgdm9pZCop OwogICAgIHN0YXRpYyB2b2lkIHdpbGxFbmROYXZpZ2F0aW9uR2VzdHVyZShXS1BhZ2VSZWYsIFdL QmFja0ZvcndhcmRMaXN0SXRlbVJlZiwgY29uc3Qgdm9pZCopOwo= 428687 2021-05-14 17:01:14 -0700 2021-05-14 22:02:14 -0700 Patch bug-225818-20210514170113.patch text/plain 6784 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3NzUxOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIxLTA1LTE0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbV2ViS2l0VGVzdFJ1bm5lcl0gRm9yd2FyZCBXZWJDb250ZW50IHRlcm1p bmF0aW9uIHJlYXNvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjI1ODE4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83ODAyNzE2ND4KKworICAgICAg ICBSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KKworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIv VGVzdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6Y3JlYXRl T3RoZXJQYWdlKTogVXNlIGRpZFRlcm1pbmF0ZSBjYWxsYmFjayBpbnN0ZWFkIG9mIGRpZENyYXNo IGNhbGxiYWNrLgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6Y3JlYXRlV2ViVmlld1dp dGhPcHRpb25zKTogRGl0dG8uCisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjp3ZWJQcm9j ZXNzRGlkVGVybWluYXRlKToKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OnByb2Nlc3NE aWRDcmFzaCk6IFJlbmFtZWQgd2ViUHJvY2Vzc0RpZFRlcm1pbmF0ZS4KKyAgICAgICAgKiBXZWJL aXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmg6IFJlcGxhY2UgcHJvY2Vzc0RpZENyYXNoIHdp dGggd2ViUHJvY2Vzc0RpZFRlcm1pbmF0ZS4KKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL3dp bi9UZXN0Q29udHJvbGxlcldpbi5jcHA6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpw bGF0Zm9ybVJ1blVudGlsKToKKwogMjAyMS0wNS0xNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBw bGUuY29tPgogCiAgICAgICAgIERyb3AgImdldCIgcHJlZml4IGZyb20gV1RGOjpGaWxlU3lzdGVt J3MgZ2V0RmlsZU1vZGlmaWNhdGlvblRpbWUoKSAvIGdldEZpbGVDcmVhdGlvblRpbWUoKQpJbmRl eDogVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAJKHJldmlzaW9uIDI3 NzUxOSkKKysrIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC00NjgsMTMgKzQ2OCwxMyBAQCBXS1BhZ2VSZWYgVGVzdENvbnRyb2xsZXI6 OmNyZWF0ZU90aGVyUGFnCiAgICAgICAgIG51bGxwdHIsIC8vIHJlbmRlcmluZ1Byb2dyZXNzRGlk Q2hhbmdlCiAgICAgICAgIGNhbkF1dGhlbnRpY2F0ZUFnYWluc3RQcm90ZWN0aW9uU3BhY2UsCiAg ICAgICAgIGRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSwKLSAgICAgICAgcHJvY2Vz c0RpZENyYXNoLAorICAgICAgICBudWxscHRyLCAvLyB3ZWJQcm9jZXNzRGlkQ3Jhc2gKICAgICAg ICAgY29weVdlYkNyeXB0b01hc3RlcktleSwKICAgICAgICAgZGlkQmVnaW5OYXZpZ2F0aW9uR2Vz dHVyZSwKICAgICAgICAgd2lsbEVuZE5hdmlnYXRpb25HZXN0dXJlLAogICAgICAgICBkaWRFbmRO YXZpZ2F0aW9uR2VzdHVyZSwKICAgICAgICAgZGlkUmVtb3ZlTmF2aWdhdGlvbkdlc3R1cmVTbmFw c2hvdCwKLSAgICAgICAgbnVsbHB0ciwgLy8gd2ViUHJvY2Vzc0RpZFRlcm1pbmF0ZQorICAgICAg ICB3ZWJQcm9jZXNzRGlkVGVybWluYXRlLCAvLyB3ZWJQcm9jZXNzRGlkVGVybWluYXRlCiAgICAg ICAgIG51bGxwdHIsIC8vIGNvbnRlbnRSdWxlTGlzdE5vdGlmaWNhdGlvbgogICAgICAgICBjb3B5 U2lnbmVkUHVibGljS2V5QW5kQ2hhbGxlbmdlU3RyaW5nLAogICAgICAgICBuYXZpZ2F0aW9uQWN0 aW9uRGlkQmVjb21lRG93bmxvYWQsCkBAIC04MTAsMTMgKzgxMCwxMyBAQCB2b2lkIFRlc3RDb250 cm9sbGVyOjpjcmVhdGVXZWJWaWV3V2l0aE9wCiAgICAgICAgIG51bGxwdHIsIC8vIHJlbmRlcmlu Z1Byb2dyZXNzRGlkQ2hhbmdlCiAgICAgICAgIGNhbkF1dGhlbnRpY2F0ZUFnYWluc3RQcm90ZWN0 aW9uU3BhY2UsCiAgICAgICAgIGRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSwKLSAg ICAgICAgcHJvY2Vzc0RpZENyYXNoLAorICAgICAgICBudWxscHRyLAogICAgICAgICBjb3B5V2Vi Q3J5cHRvTWFzdGVyS2V5LAogICAgICAgICBkaWRCZWdpbk5hdmlnYXRpb25HZXN0dXJlLAogICAg ICAgICB3aWxsRW5kTmF2aWdhdGlvbkdlc3R1cmUsCiAgICAgICAgIGRpZEVuZE5hdmlnYXRpb25H ZXN0dXJlLAogICAgICAgICBkaWRSZW1vdmVOYXZpZ2F0aW9uR2VzdHVyZVNuYXBzaG90LAotICAg ICAgICBudWxscHRyLCAvLyB3ZWJQcm9jZXNzRGlkVGVybWluYXRlCisgICAgICAgIHdlYlByb2Nl c3NEaWRUZXJtaW5hdGUsIC8vIHdlYlByb2Nlc3NEaWRUZXJtaW5hdGUKICAgICAgICAgbnVsbHB0 ciwgLy8gY29udGVudFJ1bGVMaXN0Tm90aWZpY2F0aW9uCiAgICAgICAgIGNvcHlTaWduZWRQdWJs aWNLZXlBbmRDaGFsbGVuZ2VTdHJpbmcsCiAgICAgICAgIG5hdmlnYXRpb25BY3Rpb25EaWRCZWNv bWVEb3dubG9hZCwKQEAgLTE4NjIsOSArMTg2Miw5IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OmRp ZFJlY2VpdmVBdXRoZW50aWMKICAgICBzdGF0aWNfY2FzdDxUZXN0Q29udHJvbGxlcio+KGNvbnN0 X2Nhc3Q8dm9pZCo+KGNsaWVudEluZm8pKS0+ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxl bmdlKHBhZ2UsIC8qZnJhbWUsKi8gYXV0aGVudGljYXRpb25DaGFsbGVuZ2UpOwogfQogCi12b2lk IFRlc3RDb250cm9sbGVyOjpwcm9jZXNzRGlkQ3Jhc2goV0tQYWdlUmVmIHBhZ2UsIGNvbnN0IHZv aWQqIGNsaWVudEluZm8pCit2b2lkIFRlc3RDb250cm9sbGVyOjp3ZWJQcm9jZXNzRGlkVGVybWlu YXRlKFdLUGFnZVJlZiBwYWdlLCBXS1Byb2Nlc3NUZXJtaW5hdGlvblJlYXNvbiByZWFzb24sIGNv bnN0IHZvaWQqIGNsaWVudEluZm8pCiB7Ci0gICAgc3RhdGljX2Nhc3Q8VGVzdENvbnRyb2xsZXIq Pihjb25zdF9jYXN0PHZvaWQqPihjbGllbnRJbmZvKSktPnByb2Nlc3NEaWRDcmFzaCgpOworICAg IHN0YXRpY19jYXN0PFRlc3RDb250cm9sbGVyKj4oY29uc3RfY2FzdDx2b2lkKj4oY2xpZW50SW5m bykpLT53ZWJQcm9jZXNzRGlkVGVybWluYXRlKHJlYXNvbik7CiB9CiAKIHZvaWQgVGVzdENvbnRy b2xsZXI6OmRpZEJlZ2luTmF2aWdhdGlvbkdlc3R1cmUoV0tQYWdlUmVmIHBhZ2UsIGNvbnN0IHZv aWQgKmNsaWVudEluZm8pCkBAIC0yMTU0LDEyICsyMTU0LDM1IEBAIHZvaWQgVGVzdENvbnRyb2xs ZXI6OmRvd25sb2FkRGlkUmVjZWl2ZUEKICAgICBzdGF0aWNfY2FzdDxUZXN0Q29udHJvbGxlcio+ KGNvbnN0X2Nhc3Q8dm9pZCo+KGNsaWVudEluZm8pKS0+ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlKG51bGxwdHIsIGF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKTsKIH0KIAotdm9pZCBU ZXN0Q29udHJvbGxlcjo6cHJvY2Vzc0RpZENyYXNoKCkKK3ZvaWQgVGVzdENvbnRyb2xsZXI6Ondl YlByb2Nlc3NEaWRUZXJtaW5hdGUoV0tQcm9jZXNzVGVybWluYXRpb25SZWFzb24gcmVhc29uKQog ewogICAgIC8vIFRoaXMgZnVuY3Rpb24gY2FuIGJlIGNhbGxlZCBtdWx0aXBsZSB0aW1lcyB3aGVu IGNyYXNoIGxvZ3MgYXJlIGJlaW5nIHNhdmVkIG9uIFdpbmRvd3MsIHNvCiAgICAgLy8gZW5zdXJl IHdlIG9ubHkgcHJpbnQgdGhlIGNyYXNoZWQgbWVzc2FnZSBvbmNlLgogICAgIGlmICghbV9kaWRQ cmludFdlYlByb2Nlc3NDcmFzaGVkTWVzc2FnZSkgewogICAgICAgICBwaWRfdCBwaWQgPSBXS1Bh Z2VHZXRQcm9jZXNzSWRlbnRpZmllcihtX21haW5XZWJWaWV3LT5wYWdlKCkpOworICAgICAgICBm cHJpbnRmKHN0ZGVyciwgIiVzIHRlcm1pbmF0ZWQgKHBpZCAlbGQpICIsIHdlYlByb2Nlc3NOYW1l KCksIHN0YXRpY19jYXN0PGxvbmc+KHBpZCkpOworICAgICAgICBzd2l0Y2ggKHJlYXNvbikgewor ICAgICAgICBjYXNlIGtXS1Byb2Nlc3NUZXJtaW5hdGlvblJlYXNvbkV4Y2VlZGVkTWVtb3J5TGlt aXQ6CisgICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgImJlY2F1c2UgdGhlIG1lbW9yeSBsaW1p dCB3YXMgZXhjZWVkZWRcbiIpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2Uga1dL UHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uRXhjZWVkZWRDUFVMaW1pdDoKKyAgICAgICAgICAgIGZw cmludGYoc3RkZXJyLCAiYmVjYXVzZSB0aGUgY3B1IGxpbWl0IHdhcyBleGNlZWRlZFxuIik7Cisg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBrV0tQcm9jZXNzVGVybWluYXRpb25SZWFz b25SZXF1ZXN0ZWRCeUNsaWVudDoKKyAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiYmVjYXVz ZSB0aGUgY2xpZW50IHJlcXVlc3RlZFxuIik7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAg Y2FzZSBrV0tQcm9jZXNzVGVybWluYXRpb25SZWFzb25DcmFzaDoKKyAgICAgICAgICAgIGZwcmlu dGYoc3RkZXJyLCAiYmVjYXVzZSB0aGUgcHJvY2VzcyBjcmFzaGVkXG4iKTsKKyAgICAgICAgICAg IGJyZWFrOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJm b3IgYW4gdW5rbm93biByZWFzb25cbiIpOworICAgICAgICB9CisKKyAgICAgICAgaWYgKHJlYXNv biA9PSBrV0tQcm9jZXNzVGVybWluYXRpb25SZWFzb25SZXF1ZXN0ZWRCeUNsaWVudCkgeworICAg ICAgICAgICAgZmZsdXNoKHN0ZGVycik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0K KwogICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIiNDUkFTSEVEIC0gJXMgKHBpZCAlbGQpXG4iLCB3 ZWJQcm9jZXNzTmFtZSgpLCBzdGF0aWNfY2FzdDxsb25nPihwaWQpKTsKICAgICAgICAgZmZsdXNo KHN0ZGVycik7CiAgICAgICAgIG1fZGlkUHJpbnRXZWJQcm9jZXNzQ3Jhc2hlZE1lc3NhZ2UgPSB0 cnVlOwpJbmRleDogVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuaAkocmV2aXNp b24gMjc3NTE5KQorKysgVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oCSh3 b3JraW5nIGNvcHkpCkBAIC00NjksOCArNDY5LDggQEAgcHJpdmF0ZToKICAgICBib29sIGRvd25s b2FkRGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0VG9VUkwoV0tEb3dubG9hZFJlZiwgV0tVUkxSZXF1 ZXN0UmVmKTsKICAgICBzdGF0aWMgdm9pZCBkb3dubG9hZERpZFJlY2VpdmVBdXRoZW50aWNhdGlv bkNoYWxsZW5nZShXS0Rvd25sb2FkUmVmLCBXS0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlUmVmLCBj b25zdCB2b2lkICpjbGllbnRJbmZvKTsKICAgICAKLSAgICBzdGF0aWMgdm9pZCBwcm9jZXNzRGlk Q3Jhc2goV0tQYWdlUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKLSAgICB2b2lkIHByb2Nl c3NEaWRDcmFzaCgpOworICAgIHN0YXRpYyB2b2lkIHdlYlByb2Nlc3NEaWRUZXJtaW5hdGUoV0tQ YWdlUmVmLCAgV0tQcm9jZXNzVGVybWluYXRpb25SZWFzb24sIGNvbnN0IHZvaWQqIGNsaWVudElu Zm8pOworICAgIHZvaWQgd2ViUHJvY2Vzc0RpZFRlcm1pbmF0ZShXS1Byb2Nlc3NUZXJtaW5hdGlv blJlYXNvbik7CiAKICAgICBzdGF0aWMgdm9pZCBkaWRCZWdpbk5hdmlnYXRpb25HZXN0dXJlKFdL UGFnZVJlZiwgY29uc3Qgdm9pZCopOwogICAgIHN0YXRpYyB2b2lkIHdpbGxFbmROYXZpZ2F0aW9u R2VzdHVyZShXS1BhZ2VSZWYsIFdLQmFja0ZvcndhcmRMaXN0SXRlbVJlZiwgY29uc3Qgdm9pZCop OwpJbmRleDogVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci93aW4vVGVzdENvbnRyb2xsZXJXaW4uY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvd2luL1Rlc3RDb250cm9sbGVy V2luLmNwcAkocmV2aXNpb24gMjc3NTE5KQorKysgVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci93aW4v VGVzdENvbnRyb2xsZXJXaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTUsNyArMTU1LDcgQEAg dm9pZCBUZXN0Q29udHJvbGxlcjo6cGxhdGZvcm1SdW5VbnRpbChibwogICAgIC8vIEZpcnN0LCBs ZXQgdGhlIHRlc3QgaGFybmVzcyBrbm93IHRoaXMgaGFwcGVuZWQgc28gaXQgd29uJ3QgdGhpbmsg d2UndmUgaHVuZy4gQnV0CiAgICAgLy8gbWFrZSBzdXJlIHdlIGRvbid0IGV4aXQganVzdCB5ZXQh CiAgICAgbV9zaG91bGRFeGl0V2hlbldlYlByb2Nlc3NDcmFzaGVzID0gZmFsc2U7Ci0gICAgcHJv Y2Vzc0RpZENyYXNoKCk7CisgICAgd2ViUHJvY2Vzc0RpZFRlcm1pbmF0ZShrV0tQcm9jZXNzVGVy bWluYXRpb25SZWFzb25DcmFzaCk7CiAgICAgbV9zaG91bGRFeGl0V2hlbldlYlByb2Nlc3NDcmFz aGVzID0gdHJ1ZTsKIAogICAgIC8vIFRoZW4gc3BpbiBhIHJ1biBsb29wIHVudGlsIGl0IGZpbmlz aGVzIGNyYXNoaW5nIHRvIGdpdmUgdGltZSBmb3IgYSBjcmFzaCBsb2cgdG8gYmUgc2F2ZWQuIElm Cg==