127047 2014-01-15 06:14:02 -0800 [GTK][EFL][NIX] Do not use PrintContext, Frame and DocumentLoader in Errors 2014-01-15 23:33:42 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned bunhere cdumez commit-queue gyuyoung.kim rakuco oldest_to_newest 968299 0 cgarcia 2014-01-15 06:14:02 -0800 It's a layering violation. 968300 1 221264 cgarcia 2014-01-15 06:18:01 -0800 Created attachment 221264 Patch 968302 2 cgarcia 2014-01-15 06:20:42 -0800 hmm, this doesn't apply because I wrote it on top of patch attached to bug #126979 968363 3 221278 cgarcia 2014-01-15 09:35:22 -0800 Created attachment 221278 Rebased 968386 4 221278 svillar 2014-01-15 10:16:00 -0800 Comment on attachment 221278 Rebased The change looks really awesome 968625 5 cgarcia 2014-01-15 23:33:42 -0800 Committed r162118: <http://trac.webkit.org/changeset/162118> 221264 2014-01-15 06:18:01 -0800 2014-01-15 09:35:22 -0800 Patch wk-print-errors.diff text/plain 16262 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjZGNmM2YwLi40NzgzN2FiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTQtMDEtMTUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdW0VGTF1bTklYXSBEbyBub3QgdXNlIFByaW50Q29udGV4dCwgRnJh bWUgYW5kIERvY3VtZW50TG9hZGVyIGluIEVycm9ycworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3MDQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVXNpbmcgUHJpbnRDb250ZXh0LCBGcmFtZSBhbmQgRG9j dW1lbnRMb2FkZXIgaW4gcGxhdGZvcm0gaXMgYQorICAgICAgICBsYXllcmluZyB2aW9sYXRpb24u CisgICAgICAgIENoYW5nZSBwcmludGluZyBlcnJvciBtZXRob2RzIHRvIHJlY2VpdmUgYSBmYWls aW5nIFVSTCBpbnN0ZWFkIG9mCisgICAgICAgIHJlY2VpdmluZyBhIFByaW50Q29udGV4dCB0aGF0 IHdhcyB1c2VkIG9ubHkgdG8gZ2V0IHRoZSBmYWlsaW5nCisgICAgICAgIFVSTC4KKworICAgICAg ICAqIHBsYXRmb3JtL2VmbC9FcnJvcnNFZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cHJpbnRF cnJvcik6CisgICAgICAgIChXZWJDb3JlOjpwcmludGVyTm90Rm91bmRFcnJvcik6CisgICAgICAg IChXZWJDb3JlOjppbnZhbGlkUGFnZVJhbmdlVG9QcmludCk6CisgICAgICAgICogcGxhdGZvcm0v ZWZsL0Vycm9yc0VmbC5oOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9FcnJvcnNHdGsuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6cHJpbnRFcnJvcik6CisgICAgICAgIChXZWJDb3JlOjpwcmludGVy Tm90Rm91bmRFcnJvcik6CisgICAgICAgIChXZWJDb3JlOjppbnZhbGlkUGFnZVJhbmdlVG9Qcmlu dCk6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL0Vycm9yc0d0ay5oOgorICAgICAgICAqIHBsYXRm b3JtL25peC9FcnJvcnNOaXguY3BwOgorICAgICAgICAoV2ViQ29yZTo6cHJpbnRFcnJvcik6Cisg ICAgICAgIChXZWJDb3JlOjpwcmludGVyTm90Rm91bmRFcnJvcik6CisgICAgICAgIChXZWJDb3Jl OjppbnZhbGlkUGFnZVJhbmdlVG9QcmludCk6CisgICAgICAgICogcGxhdGZvcm0vbml4L0Vycm9y c05peC5oOgorCiAyMDE0LTAxLTE0ICBDaGFuZ1Nlb2sgT2ggIDxjaGFuZ3Nlb2sub2hAY29sbGFi b3JhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeCBhZnRlciByMTYxOTgwLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL0Vycm9yc0VmbC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvRXJyb3JzRWZsLmNwcAppbmRleCBkYTJlMjNkLi5l ZGM5MDhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvRXJyb3JzRWZs LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvRXJyb3JzRWZsLmNwcApAQCAt MjYsMTAgKzI2LDYgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJFcnJvcnNFZmwu aCIKIAotI2luY2x1ZGUgIkRvY3VtZW50TG9hZGVyLmgiCi0jaW5jbHVkZSAiRnJhbWUuaCIKLSNp bmNsdWRlICJGcmFtZUxvYWRlci5oIgotI2luY2x1ZGUgIlByaW50Q29udGV4dC5oIgogI2luY2x1 ZGUgIlJlc291cmNlRXJyb3IuaCIKICNpbmNsdWRlICJSZXNvdXJjZVJlcXVlc3QuaCIKICNpbmNs dWRlICJSZXNvdXJjZVJlc3BvbnNlLmgiCkBAIC04NiwyNSArODIsMTkgQEAgUmVzb3VyY2VFcnJv ciBkb3dubG9hZERlc3RpbmF0aW9uRXJyb3IoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9u c2UsIGNvbnN0IFMKICAgICByZXR1cm4gUmVzb3VyY2VFcnJvcihlcnJvckRvbWFpbkRvd25sb2Fk LCBEb3dubG9hZEVycm9yRGVzdGluYXRpb24sIHJlc3BvbnNlLnVybCgpLnN0cmluZygpLCBlcnJv ck1lc3NhZ2UpOwogfQogCi1SZXNvdXJjZUVycm9yIHByaW50RXJyb3IoY29uc3QgUHJpbnRDb250 ZXh0KiBwcmludENvbnRleHQsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKQorUmVzb3VyY2VF cnJvciBwcmludEVycm9yKGNvbnN0IFVSTCYgZmFpbGluZ1VSTCwgY29uc3QgU3RyaW5nJiBlcnJv ck1lc3NhZ2UpCiB7Ci0gICAgRG9jdW1lbnRMb2FkZXIqIGRvY3VtZW50TG9hZGVyID0gcHJpbnRD b250ZXh0LT5mcmFtZSgpLT5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpOwotCi0gICAgcmV0dXJu IFJlc291cmNlRXJyb3IoZXJyb3JEb21haW5QcmludCwgUHJpbnRFcnJvckdlbmVyYWwsIGRvY3Vt ZW50TG9hZGVyID8gZG9jdW1lbnRMb2FkZXItPnVybCgpIDogVVJMKCksIGVycm9yTWVzc2FnZSk7 CisgICAgcmV0dXJuIFJlc291cmNlRXJyb3IoZXJyb3JEb21haW5QcmludCwgUHJpbnRFcnJvckdl bmVyYWwsIGZhaWxpbmdVUkwsIGVycm9yTWVzc2FnZSk7CiB9CiAKLVJlc291cmNlRXJyb3IgcHJp bnRlck5vdEZvdW5kRXJyb3IoY29uc3QgUHJpbnRDb250ZXh0KiBwcmludENvbnRleHQpCitSZXNv dXJjZUVycm9yIHByaW50ZXJOb3RGb3VuZEVycm9yKGNvbnN0IFVSTCYgZmFpbGluZ1VSTCkKIHsK LSAgICBEb2N1bWVudExvYWRlciogZG9jdW1lbnRMb2FkZXIgPSBwcmludENvbnRleHQtPmZyYW1l KCktPmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCk7Ci0KLSAgICByZXR1cm4gUmVzb3VyY2VFcnJv cihlcnJvckRvbWFpblByaW50LCBQcmludEVycm9yUHJpbnRlck5vdEZvdW5kLCBkb2N1bWVudExv YWRlciA/IGRvY3VtZW50TG9hZGVyLT51cmwoKSA6IFVSTCgpLCBBU0NJSUxpdGVyYWwoIlByaW50 ZXIgbm90IGZvdW5kIikpOworICAgIHJldHVybiBSZXNvdXJjZUVycm9yKGVycm9yRG9tYWluUHJp bnQsIFByaW50RXJyb3JQcmludGVyTm90Rm91bmQsIGZhaWxpbmdVUkwsIEFTQ0lJTGl0ZXJhbCgi UHJpbnRlciBub3QgZm91bmQiKSk7CiB9CiAKLVJlc291cmNlRXJyb3IgaW52YWxpZFBhZ2VSYW5n ZVRvUHJpbnQoY29uc3QgUHJpbnRDb250ZXh0KiBwcmludENvbnRleHQpCitSZXNvdXJjZUVycm9y IGludmFsaWRQYWdlUmFuZ2VUb1ByaW50KGNvbnN0IFVSTCYgZmFpbGluZ1VSTCkKIHsKLSAgICBE b2N1bWVudExvYWRlciogZG9jdW1lbnRMb2FkZXIgPSBwcmludENvbnRleHQtPmZyYW1lKCktPmxv YWRlcigpLmRvY3VtZW50TG9hZGVyKCk7Ci0KLSAgICByZXR1cm4gUmVzb3VyY2VFcnJvcihlcnJv ckRvbWFpblByaW50LCBQcmludEVycm9ySW52YWxpZFBhZ2VSYW5nZSwgZG9jdW1lbnRMb2FkZXIg PyBkb2N1bWVudExvYWRlci0+dXJsKCkgOiBVUkwoKSwgQVNDSUlMaXRlcmFsKCJJbnZhbGlkIHBh Z2UgcmFuZ2UiKSk7CisgICAgcmV0dXJuIFJlc291cmNlRXJyb3IoZXJyb3JEb21haW5QcmludCwg UHJpbnRFcnJvckludmFsaWRQYWdlUmFuZ2UsIGZhaWxpbmdVUkwsIEFTQ0lJTGl0ZXJhbCgiSW52 YWxpZCBwYWdlIHJhbmdlIikpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvRXJyb3JzRWZsLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9lZmwvRXJyb3JzRWZsLmgKaW5kZXggMDI5ZjBkNi4uMTQ3YmFmZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL0Vycm9yc0VmbC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9FcnJvcnNFZmwuaApAQCAtMzAsMTAgKzMwLDEwIEBA CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotY2xhc3MgUHJpbnRDb250ZXh0OwogY2xhc3MgUmVz b3VyY2VFcnJvcjsKIGNsYXNzIFJlc291cmNlUmVxdWVzdDsKIGNsYXNzIFJlc291cmNlUmVzcG9u c2U7CitjbGFzcyBVUkw7CiAKIHN0YXRpYyBjb25zdCBjaGFyIGVycm9yRG9tYWluTmV0d29ya1td ID0gIldlYktpdE5ldHdvcmtFcnJvciI7CiBzdGF0aWMgY29uc3QgY2hhciBlcnJvckRvbWFpblBv bGljeVtdID0gIldlYktpdFBvbGljeUVycm9yIjsKQEAgLTkwLDkgKzkwLDkgQEAgUmVzb3VyY2VF cnJvciBwbHVnaW5XaWxsSGFuZGxlTG9hZEVycm9yKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsK IFJlc291cmNlRXJyb3IgZG93bmxvYWROZXR3b3JrRXJyb3IoY29uc3QgUmVzb3VyY2VFcnJvciYp OwogUmVzb3VyY2VFcnJvciBkb3dubG9hZENhbmNlbGxlZEJ5VXNlckVycm9yKGNvbnN0IFJlc291 cmNlUmVzcG9uc2UmKTsKIFJlc291cmNlRXJyb3IgZG93bmxvYWREZXN0aW5hdGlvbkVycm9yKGNv bnN0IFJlc291cmNlUmVzcG9uc2UmLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSk7Ci1SZXNv dXJjZUVycm9yIHByaW50RXJyb3IoY29uc3QgUHJpbnRDb250ZXh0KiwgY29uc3QgU3RyaW5nJiBl cnJvck1lc3NhZ2UpOwotUmVzb3VyY2VFcnJvciBwcmludGVyTm90Rm91bmRFcnJvcihjb25zdCBQ cmludENvbnRleHQqKTsKLVJlc291cmNlRXJyb3IgaW52YWxpZFBhZ2VSYW5nZVRvUHJpbnQoY29u c3QgUHJpbnRDb250ZXh0Kik7CitSZXNvdXJjZUVycm9yIHByaW50RXJyb3IoY29uc3QgVVJMJiBm YWlsaW5nVVJMLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSk7CitSZXNvdXJjZUVycm9yIHBy aW50ZXJOb3RGb3VuZEVycm9yKGNvbnN0IFVSTCYgZmFpbGluZ1VSTCk7CitSZXNvdXJjZUVycm9y IGludmFsaWRQYWdlUmFuZ2VUb1ByaW50KGNvbnN0IFVSTCYgZmFpbGluZ1VSTCk7CiAKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0Vycm9yc0d0ay5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvRXJyb3JzR3RrLmNwcAppbmRleCAzY2Y2YjAwLi42 OTU1ODE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvRXJyb3JzR3Rr LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvRXJyb3JzR3RrLmNwcApAQCAt MjAsMTAgKzIwLDYgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJFcnJvcnNHdGsu aCIKIAotI2luY2x1ZGUgIkRvY3VtZW50TG9hZGVyLmgiCi0jaW5jbHVkZSAiRnJhbWUuaCIKLSNp bmNsdWRlICJGcmFtZUxvYWRlci5oIgotI2luY2x1ZGUgIlByaW50Q29udGV4dC5oIgogI2luY2x1 ZGUgIlJlc291cmNlRXJyb3IuaCIKICNpbmNsdWRlICJSZXNvdXJjZVJlcXVlc3QuaCIKICNpbmNs dWRlICJSZXNvdXJjZVJlc3BvbnNlLmgiCkBAIC05MSwyNSArODcsMTkgQEAgUmVzb3VyY2VFcnJv ciBkb3dubG9hZERlc3RpbmF0aW9uRXJyb3IoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9u c2UsIGNvbnN0IFMKICAgICAgICAgICAgICAgICAgICAgICAgICByZXNwb25zZS51cmwoKS5zdHJp bmcoKSwgZXJyb3JNZXNzYWdlKTsKIH0KIAotUmVzb3VyY2VFcnJvciBwcmludEVycm9yKGNvbnN0 IFByaW50Q29udGV4dCogcHJpbnRDb250ZXh0LCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSkK K1Jlc291cmNlRXJyb3IgcHJpbnRFcnJvcihjb25zdCBVUkwmIGZhaWxpbmdVUkwsIGNvbnN0IFN0 cmluZyYgZXJyb3JNZXNzYWdlKQogewotICAgIERvY3VtZW50TG9hZGVyKiBkb2N1bWVudExvYWRl ciA9IHByaW50Q29udGV4dC0+ZnJhbWUoKS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKTsKLSAg ICByZXR1cm4gUmVzb3VyY2VFcnJvcihlcnJvckRvbWFpblByaW50LCBQcmludEVycm9yR2VuZXJh bCwKLSAgICAgICAgICAgICAgICAgICAgICAgICBkb2N1bWVudExvYWRlciA/IGRvY3VtZW50TG9h ZGVyLT51cmwoKSA6IFVSTCgpLCBlcnJvck1lc3NhZ2UpOworICAgIHJldHVybiBSZXNvdXJjZUVy cm9yKGVycm9yRG9tYWluUHJpbnQsIFByaW50RXJyb3JHZW5lcmFsLCBmYWlsaW5nVVJMLCBlcnJv ck1lc3NhZ2UpOwogfQogCi1SZXNvdXJjZUVycm9yIHByaW50ZXJOb3RGb3VuZEVycm9yKGNvbnN0 IFByaW50Q29udGV4dCogcHJpbnRDb250ZXh0KQorUmVzb3VyY2VFcnJvciBwcmludGVyTm90Rm91 bmRFcnJvcihjb25zdCBVUkwmIGZhaWxpbmdVUkwpCiB7Ci0gICAgRG9jdW1lbnRMb2FkZXIqIGRv Y3VtZW50TG9hZGVyID0gcHJpbnRDb250ZXh0LT5mcmFtZSgpLT5sb2FkZXIoKS5kb2N1bWVudExv YWRlcigpOwotICAgIHJldHVybiBSZXNvdXJjZUVycm9yKGVycm9yRG9tYWluUHJpbnQsIFByaW50 RXJyb3JQcmludGVyTm90Rm91bmQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgZG9jdW1lbnRM b2FkZXIgPyBkb2N1bWVudExvYWRlci0+dXJsKCkgOiBVUkwoKSwgXygiUHJpbnRlciBub3QgZm91 bmQiKSk7CisgICAgcmV0dXJuIFJlc291cmNlRXJyb3IoZXJyb3JEb21haW5QcmludCwgUHJpbnRF cnJvclByaW50ZXJOb3RGb3VuZCwgZmFpbGluZ1VSTCwgXygiUHJpbnRlciBub3QgZm91bmQiKSk7 CiB9CiAKLVJlc291cmNlRXJyb3IgaW52YWxpZFBhZ2VSYW5nZVRvUHJpbnQoY29uc3QgUHJpbnRD b250ZXh0KiBwcmludENvbnRleHQpCitSZXNvdXJjZUVycm9yIGludmFsaWRQYWdlUmFuZ2VUb1By aW50KGNvbnN0IFVSTCYgZmFpbGluZ1VSTCkKIHsKLSAgICBEb2N1bWVudExvYWRlciogZG9jdW1l bnRMb2FkZXIgPSBwcmludENvbnRleHQtPmZyYW1lKCktPmxvYWRlcigpLmRvY3VtZW50TG9hZGVy KCk7Ci0gICAgcmV0dXJuIFJlc291cmNlRXJyb3IoZXJyb3JEb21haW5QcmludCwgUHJpbnRFcnJv ckludmFsaWRQYWdlUmFuZ2UsCi0gICAgICAgICAgICAgICAgICAgICAgICAgZG9jdW1lbnRMb2Fk ZXIgPyBkb2N1bWVudExvYWRlci0+dXJsKCkgOiBVUkwoKSwgXygiSW52YWxpZCBwYWdlIHJhbmdl IikpOworICAgIHJldHVybiBSZXNvdXJjZUVycm9yKGVycm9yRG9tYWluUHJpbnQsIFByaW50RXJy b3JJbnZhbGlkUGFnZVJhbmdlLCBmYWlsaW5nVVJMLCBfKCJJbnZhbGlkIHBhZ2UgcmFuZ2UiKSk7 CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2d0ay9FcnJvcnNHdGsuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9F cnJvcnNHdGsuaAppbmRleCA1ODJjYzk5Li4wYzE0NzE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvRXJyb3JzR3RrLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL0Vycm9yc0d0ay5oCkBAIC0yNCwxMCArMjQsMTAgQEAKIAogbmFtZXNwYWNlIFdlYkNv cmUgewogCi1jbGFzcyBQcmludENvbnRleHQ7CiBjbGFzcyBSZXNvdXJjZUVycm9yOwogY2xhc3Mg UmVzb3VyY2VSZXF1ZXN0OwogY2xhc3MgUmVzb3VyY2VSZXNwb25zZTsKK2NsYXNzIFVSTDsKIAog Y29uc3QgY2hhciogY29uc3QgZXJyb3JEb21haW5OZXR3b3JrID0gIldlYktpdE5ldHdvcmtFcnJv ciI7CiBjb25zdCBjaGFyKiBjb25zdCBlcnJvckRvbWFpblBvbGljeSA9ICJXZWJLaXRQb2xpY3lF cnJvciI7CkBAIC04Myw5ICs4Myw5IEBAIFJlc291cmNlRXJyb3IgcGx1Z2luV2lsbEhhbmRsZUxv YWRFcnJvcihjb25zdCBSZXNvdXJjZVJlc3BvbnNlJik7CiBSZXNvdXJjZUVycm9yIGRvd25sb2Fk TmV0d29ya0Vycm9yKGNvbnN0IFJlc291cmNlRXJyb3ImKTsKIFJlc291cmNlRXJyb3IgZG93bmxv YWRDYW5jZWxsZWRCeVVzZXJFcnJvcihjb25zdCBSZXNvdXJjZVJlc3BvbnNlJik7CiBSZXNvdXJj ZUVycm9yIGRvd25sb2FkRGVzdGluYXRpb25FcnJvcihjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiwg Y29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpOwotUmVzb3VyY2VFcnJvciBwcmludEVycm9yKGNv bnN0IFByaW50Q29udGV4dCosIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKTsKLVJlc291cmNl RXJyb3IgcHJpbnRlck5vdEZvdW5kRXJyb3IoY29uc3QgUHJpbnRDb250ZXh0Kik7Ci1SZXNvdXJj ZUVycm9yIGludmFsaWRQYWdlUmFuZ2VUb1ByaW50KGNvbnN0IFByaW50Q29udGV4dCopOworUmVz b3VyY2VFcnJvciBwcmludEVycm9yKGNvbnN0IFVSTCYgZmFpbGluZ1VSTCwgY29uc3QgU3RyaW5n JiBlcnJvck1lc3NhZ2UpOworUmVzb3VyY2VFcnJvciBwcmludGVyTm90Rm91bmRFcnJvcihjb25z dCBVUkwmIGZhaWxpbmdVUkwpOworUmVzb3VyY2VFcnJvciBpbnZhbGlkUGFnZVJhbmdlVG9Qcmlu dChjb25zdCBVUkwmIGZhaWxpbmdVUkwpOwogCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25peC9FcnJvcnNOaXguY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bml4L0Vycm9yc05peC5jcHAKaW5kZXggNDkyOWJlNC4uYTk5NGI1NiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbml4L0Vycm9yc05peC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbml4L0Vycm9yc05peC5jcHAKQEAgLTI3LDkgKzI3LDYgQEAKICNpbmNsdWRl ICJjb25maWcuaCIKICNpbmNsdWRlICJFcnJvcnNOaXguaCIKIAotI2luY2x1ZGUgIkRvY3VtZW50 TG9hZGVyLmgiCi0jaW5jbHVkZSAiRnJhbWUuaCIKLSNpbmNsdWRlICJQcmludENvbnRleHQuaCIK ICNpbmNsdWRlICJSZXNvdXJjZUVycm9yLmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VSZXF1ZXN0Lmgi CiAjaW5jbHVkZSAiUmVzb3VyY2VSZXNwb25zZS5oIgpAQCAtODYsMjUgKzgzLDE5IEBAIFJlc291 cmNlRXJyb3IgZG93bmxvYWREZXN0aW5hdGlvbkVycm9yKGNvbnN0IFJlc291cmNlUmVzcG9uc2Um IHJlc3BvbnNlLCBjb25zdCBTCiAgICAgcmV0dXJuIFJlc291cmNlRXJyb3IoZXJyb3JEb21haW5E b3dubG9hZCwgRG93bmxvYWRFcnJvckRlc3RpbmF0aW9uLCByZXNwb25zZS51cmwoKS5zdHJpbmco KSwgZXJyb3JNZXNzYWdlKTsKIH0KIAotUmVzb3VyY2VFcnJvciBwcmludEVycm9yKGNvbnN0IFBy aW50Q29udGV4dCogcHJpbnRDb250ZXh0LCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSkKK1Jl c291cmNlRXJyb3IgcHJpbnRFcnJvcihjb25zdCBVUkwmIGZhaWxpbmdVUkwsIGNvbnN0IFN0cmlu ZyYgZXJyb3JNZXNzYWdlKQogewotICAgIERvY3VtZW50TG9hZGVyKiBkb2N1bWVudExvYWRlciA9 IHByaW50Q29udGV4dC0+ZnJhbWUoKS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKTsKLQotICAg IHJldHVybiBSZXNvdXJjZUVycm9yKGVycm9yRG9tYWluUHJpbnQsIFByaW50RXJyb3JHZW5lcmFs LCBkb2N1bWVudExvYWRlciA/IGRvY3VtZW50TG9hZGVyLT51cmwoKSA6IFVSTCgpLCBlcnJvck1l c3NhZ2UpOworICAgIHJldHVybiBSZXNvdXJjZUVycm9yKGVycm9yRG9tYWluUHJpbnQsIFByaW50 RXJyb3JHZW5lcmFsLCBmYWlsaW5nVVJMLCBlcnJvck1lc3NhZ2UpOwogfQogCi1SZXNvdXJjZUVy cm9yIHByaW50ZXJOb3RGb3VuZEVycm9yKGNvbnN0IFByaW50Q29udGV4dCogcHJpbnRDb250ZXh0 KQorUmVzb3VyY2VFcnJvciBwcmludGVyTm90Rm91bmRFcnJvcihjb25zdCBVUkwmIGZhaWxpbmdV UkwpCiB7Ci0gICAgRG9jdW1lbnRMb2FkZXIqIGRvY3VtZW50TG9hZGVyID0gcHJpbnRDb250ZXh0 LT5mcmFtZSgpLT5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpOwotCi0gICAgcmV0dXJuIFJlc291 cmNlRXJyb3IoZXJyb3JEb21haW5QcmludCwgUHJpbnRFcnJvclByaW50ZXJOb3RGb3VuZCwgZG9j dW1lbnRMb2FkZXIgPyBkb2N1bWVudExvYWRlci0+dXJsKCkgOiBVUkwoKSwgQVNDSUlMaXRlcmFs KCJQcmludGVyIG5vdCBmb3VuZCIpKTsKKyAgICByZXR1cm4gUmVzb3VyY2VFcnJvcihlcnJvckRv bWFpblByaW50LCBQcmludEVycm9yUHJpbnRlck5vdEZvdW5kLCBmYWlsaW5nVVJMLCBBU0NJSUxp dGVyYWwoIlByaW50ZXIgbm90IGZvdW5kIikpOwogfQogCi1SZXNvdXJjZUVycm9yIGludmFsaWRQ YWdlUmFuZ2VUb1ByaW50KGNvbnN0IFByaW50Q29udGV4dCogcHJpbnRDb250ZXh0KQorUmVzb3Vy Y2VFcnJvciBpbnZhbGlkUGFnZVJhbmdlVG9QcmludChjb25zdCBVUkwmIGZhaWxpbmdVUkwpCiB7 Ci0gICAgRG9jdW1lbnRMb2FkZXIqIGRvY3VtZW50TG9hZGVyID0gcHJpbnRDb250ZXh0LT5mcmFt ZSgpLT5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpOwotCi0gICAgcmV0dXJuIFJlc291cmNlRXJy b3IoZXJyb3JEb21haW5QcmludCwgUHJpbnRFcnJvckludmFsaWRQYWdlUmFuZ2UsIGRvY3VtZW50 TG9hZGVyID8gZG9jdW1lbnRMb2FkZXItPnVybCgpIDogVVJMKCksIEFTQ0lJTGl0ZXJhbCgiSW52 YWxpZCBwYWdlIHJhbmdlIikpOworICAgIHJldHVybiBSZXNvdXJjZUVycm9yKGVycm9yRG9tYWlu UHJpbnQsIFByaW50RXJyb3JJbnZhbGlkUGFnZVJhbmdlLCBmYWlsaW5nVVJMLCBBU0NJSUxpdGVy YWwoIkludmFsaWQgcGFnZSByYW5nZSIpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbml4L0Vycm9yc05peC5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbml4L0Vycm9yc05peC5oCmluZGV4IGM3MWIwZWMuLjFlOTVi MWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25peC9FcnJvcnNOaXguaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uaXgvRXJyb3JzTml4LmgKQEAgLTMxLDEwICsz MSwxMCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNzIFByaW50Q29udGV4dDsKIGNs YXNzIFJlc291cmNlRXJyb3I7CiBjbGFzcyBSZXNvdXJjZVJlcXVlc3Q7CiBjbGFzcyBSZXNvdXJj ZVJlc3BvbnNlOworY2xhc3MgVVJMOwogCiBzdGF0aWMgY29uc3QgY2hhciBlcnJvckRvbWFpbk5l dHdvcmtbXSA9ICJXZWJLaXROZXR3b3JrRXJyb3IiOwogc3RhdGljIGNvbnN0IGNoYXIgZXJyb3JE b21haW5Qb2xpY3lbXSA9ICJXZWJLaXRQb2xpY3lFcnJvciI7CkBAIC05MSw5ICs5MSw5IEBAIFJl c291cmNlRXJyb3IgcGx1Z2luV2lsbEhhbmRsZUxvYWRFcnJvcihjb25zdCBSZXNvdXJjZVJlc3Bv bnNlJik7CiBSZXNvdXJjZUVycm9yIGRvd25sb2FkTmV0d29ya0Vycm9yKGNvbnN0IFJlc291cmNl RXJyb3ImKTsKIFJlc291cmNlRXJyb3IgZG93bmxvYWRDYW5jZWxsZWRCeVVzZXJFcnJvcihjb25z dCBSZXNvdXJjZVJlc3BvbnNlJik7CiBSZXNvdXJjZUVycm9yIGRvd25sb2FkRGVzdGluYXRpb25F cnJvcihjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2Up OwotUmVzb3VyY2VFcnJvciBwcmludEVycm9yKGNvbnN0IFByaW50Q29udGV4dCosIGNvbnN0IFN0 cmluZyYgZXJyb3JNZXNzYWdlKTsKLVJlc291cmNlRXJyb3IgcHJpbnRlck5vdEZvdW5kRXJyb3Io Y29uc3QgUHJpbnRDb250ZXh0Kik7Ci1SZXNvdXJjZUVycm9yIGludmFsaWRQYWdlUmFuZ2VUb1By aW50KGNvbnN0IFByaW50Q29udGV4dCopOworUmVzb3VyY2VFcnJvciBwcmludEVycm9yKGNvbnN0 IFVSTCYgZmFpbGluZ1VSTCwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpOworUmVzb3VyY2VF cnJvciBwcmludGVyTm90Rm91bmRFcnJvcihjb25zdCBVUkwmIGZhaWxpbmdVUkwpOworUmVzb3Vy Y2VFcnJvciBpbnZhbGlkUGFnZVJhbmdlVG9QcmludChjb25zdCBVUkwmIGZhaWxpbmdVUkwpOwog CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBhZjNlOWZjMC4uMjc2NGQw MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDE0LTAxLTE1ICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAorICAgICAgICBbR1RLXVtFRkxdW05JWF0g RG8gbm90IHVzZSBQcmludENvbnRleHQsIEZyYW1lIGFuZCBEb2N1bWVudExvYWRlciBpbiBFcnJv cnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzA0 NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL2d0ay9XZWJQcmludE9wZXJhdGlvbkd0ay5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlByaW50T3BlcmF0aW9uR3RrOjpmcmFtZVVSTCk6IEhlbHBlciBmdW5jdGlvbiB0 byBnZXQKKyAgICAgICAgdGhlIFVSTCBvZiB0aGUgZnJhbWUgYmVpbmcgcHJpbnRlZC4KKyAgICAg ICAgKFdlYktpdDo6V2ViUHJpbnRPcGVyYXRpb25HdGs6OnByaW50KTogVXNlIGZyYW1lVVJMKCkg YXMgZmFpbGluZworICAgICAgICBVUkwgZm9yIHByaW50aW5nIGVycm9ycy4KKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlByaW50T3BlcmF0aW9uR3RrLmg6CisKKzIwMTQtMDEt MTUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAgICAgICAg IFtHVEtdIFdlYiBwcm9jZXNzIHNvbWV0aW1lcyBjcmFzaGVzIHdoZW4gcHJpbnRpbmcgaW4gc3lu Y2hyb25vdXMgbW9kZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTI2OTc5CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9ndGsvV2ViUHJpbnRPcGVyYXRpb25HdGsuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL2d0ay9XZWJQcmludE9wZXJhdGlvbkd0ay5jcHAKaW5kZXggN2Y3NTBlOC4u YjFlYjE1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0 ay9XZWJQcmludE9wZXJhdGlvbkd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL2d0ay9XZWJQcmludE9wZXJhdGlvbkd0ay5jcHAKQEAgLTI5LDEyICsyOSwxNSBA QAogI2luY2x1ZGUgIldlYkNvcmVBcmd1bWVudENvZGVycy5oIgogI2luY2x1ZGUgIldlYlBhZ2Uu aCIKICNpbmNsdWRlICJXZWJQYWdlUHJveHlNZXNzYWdlcy5oIgorI2luY2x1ZGUgPFdlYkNvcmUv RG9jdW1lbnRMb2FkZXIuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0Vycm9yc0d0ay5oPgorI2luY2x1 ZGUgPFdlYkNvcmUvRnJhbWUuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0ludFJlY3QuaD4KICNpbmNs dWRlIDxXZWJDb3JlL05vdEltcGxlbWVudGVkLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QbGF0Zm9y bUNvbnRleHRDYWlyby5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUHJpbnRDb250ZXh0Lmg+CiAjaW5j bHVkZSA8V2ViQ29yZS9SZXNvdXJjZUVycm9yLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9VUkwuaD4K ICNpbmNsdWRlIDxndGsvZ3RrLmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogI2luY2x1ZGUg PHd0Zi9nb2JqZWN0L0dPd25QdHIuaD4KQEAgLTY2LDcgKzY5LDcgQEAgcHVibGljOgogICAgICAg ICBjb25zdCBjaGFyKiBwcmludGVyTmFtZSA9IGd0a19wcmludF9zZXR0aW5nc19nZXRfcHJpbnRl cihtX3ByaW50U2V0dGluZ3MuZ2V0KCkpOwogICAgICAgICBHdGtQcmludGVyKiBwcmludGVyID0g cHJpbnRlck5hbWUgPyBwcmludGVyTGlzdC0+ZmluZFByaW50ZXIocHJpbnRlck5hbWUpIDogcHJp bnRlckxpc3QtPmRlZmF1bHRQcmludGVyKCk7CiAgICAgICAgIGlmICghcHJpbnRlcikgewotICAg ICAgICAgICAgcHJpbnREb25lKHByaW50ZXJOb3RGb3VuZEVycm9yKG1fcHJpbnRDb250ZXh0KSk7 CisgICAgICAgICAgICBwcmludERvbmUocHJpbnRlck5vdEZvdW5kRXJyb3IoZnJhbWVVUkwoKSkp OwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKQEAgLTc4LDcgKzgxLDcgQEAgcHVi bGljOgogICAgICAgICBHT3duUHRyPEdFcnJvcj4gZXJyb3I7CiAgICAgICAgIGNhaXJvX3N1cmZh Y2VfdCogc3VyZmFjZSA9IGd0a19wcmludF9qb2JfZ2V0X3N1cmZhY2UobV9wcmludEpvYi5nZXQo KSwgJmVycm9yLm91dFB0cigpKTsKICAgICAgICAgaWYgKCFzdXJmYWNlKSB7Ci0gICAgICAgICAg ICBwcmludERvbmUocHJpbnRFcnJvcihtX3ByaW50Q29udGV4dCwgZXJyb3ItPm1lc3NhZ2UpKTsK KyAgICAgICAgICAgIHByaW50RG9uZShwcmludEVycm9yKGZyYW1lVVJMKCksIGVycm9yLT5tZXNz YWdlKSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIApAQCAtMTM3LDcgKzE0MCw3 IEBAIHB1YmxpYzoKIAogICAgIHN0YXRpYyB2b2lkIHByaW50Sm9iQ29tcGxldGUoR3RrUHJpbnRK b2IqIHByaW50Sm9iLCBXZWJQcmludE9wZXJhdGlvbkd0a1VuaXgqIHByaW50T3BlcmF0aW9uLCBj b25zdCBHRXJyb3IqIGVycm9yKQogICAgIHsKLSAgICAgICAgcHJpbnRPcGVyYXRpb24tPnByaW50 RG9uZShlcnJvciA/IHByaW50RXJyb3IocHJpbnRPcGVyYXRpb24tPm1fcHJpbnRDb250ZXh0LCBl cnJvci0+bWVzc2FnZSkgOiBXZWJDb3JlOjpSZXNvdXJjZUVycm9yKCkpOworICAgICAgICBwcmlu dE9wZXJhdGlvbi0+cHJpbnREb25lKGVycm9yID8gcHJpbnRFcnJvcihwcmludE9wZXJhdGlvbi0+ ZnJhbWVVUkwoKSwgZXJyb3ItPm1lc3NhZ2UpIDogV2ViQ29yZTo6UmVzb3VyY2VFcnJvcigpKTsK ICAgICAgICAgcHJpbnRPcGVyYXRpb24tPm1fcHJpbnRKb2IgPSAwOwogICAgIH0KIApAQCAtNDI3 LDYgKzQzMCwxNSBAQCBib29sIFdlYlByaW50T3BlcmF0aW9uR3RrOjpjdXJyZW50UGFnZUlzTGFz dFBhZ2VPZlNoZWV0KCkgY29uc3QKICAgICByZXR1cm4gKG1fbnVtYmVyVXAgPCAyIHx8ICEoKG1f cGFnZVBvc2l0aW9uICsgMSkgJSBtX251bWJlclVwKSB8fCBtX3BhZ2VQb3NpdGlvbiA9PSBtX251 bWJlck9mUGFnZXNUb1ByaW50IC0gMSk7CiB9CiAKK1dlYkNvcmU6OlVSTCBXZWJQcmludE9wZXJh dGlvbkd0azo6ZnJhbWVVUkwoKSBjb25zdAoreworICAgIGlmICghbV9wcmludENvbnRleHQpCisg ICAgICAgIHJldHVybiBXZWJDb3JlOjpVUkwoKTsKKworICAgIFdlYkNvcmU6OkRvY3VtZW50TG9h ZGVyKiBkb2N1bWVudExvYWRlciA9IG1fcHJpbnRDb250ZXh0LT5mcmFtZSgpLT5sb2FkZXIoKS5k b2N1bWVudExvYWRlcigpOworICAgIHJldHVybiBkb2N1bWVudExvYWRlciA/IGRvY3VtZW50TG9h ZGVyLT51cmwoKSA6IFdlYkNvcmU6OlVSTCgpOworfQorCiB2b2lkIFdlYlByaW50T3BlcmF0aW9u R3RrOjpyb3RhdGVQYWdlSWZOZWVkZWQoKQogewogICAgIGlmICghbV9uZWVkc1JvdGF0aW9uKQpA QCAtNjkzLDcgKzcwNSw3IEBAIHZvaWQgV2ViUHJpbnRPcGVyYXRpb25HdGs6OnByaW50KGNhaXJv X3N1cmZhY2VfdCogc3VyZmFjZSwgZG91YmxlIHhEUEksIGRvdWJsZSB5CiAgICAgT3duUHRyPFBy aW50UGFnZXNEYXRhPiBkYXRhID0gYWRvcHRQdHIobmV3IFByaW50UGFnZXNEYXRhKHRoaXMpKTsK ICAgICBpZiAoIWRhdGEtPmlzVmFsaWQpIHsKICAgICAgICAgY2Fpcm9fc3VyZmFjZV9maW5pc2go c3VyZmFjZSk7Ci0gICAgICAgIHByaW50RG9uZShpbnZhbGlkUGFnZVJhbmdlVG9QcmludChtX3By aW50Q29udGV4dCkpOworICAgICAgICBwcmludERvbmUoaW52YWxpZFBhZ2VSYW5nZVRvUHJpbnQo ZnJhbWVVUkwoKSkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlByaW50T3BlcmF0aW9uR3RrLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlByaW50T3BlcmF0aW9u R3RrLmgKaW5kZXggYTg4NDAzOS4uNDM4ZjM0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9XZWJQcmludE9wZXJhdGlvbkd0ay5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUHJpbnRPcGVyYXRpb25HdGsuaApA QCAtMzksNiArMzksNyBAQCB0eXBlZGVmIHN0cnVjdCBfR3RrUGFnZVJhbmdlIEd0a1BhZ2VSYW5n ZTsKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIFByaW50Q29udGV4dDsKIGNsYXNzIFJlc291 cmNlRXJyb3I7CitjbGFzcyBVUkw7CiB9OwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTkyLDYg KzkzLDcgQEAgcHJvdGVjdGVkOgogICAgIHZvaWQgcHJlcGFyZUNvbnRleHRUb0RyYXcoKTsKICAg ICB2b2lkIHByaW50UGFnZXNEb25lKCk7CiAgICAgdm9pZCBwcmludERvbmUoY29uc3QgV2ViQ29y ZTo6UmVzb3VyY2VFcnJvciYpOworICAgIFdlYkNvcmU6OlVSTCBmcmFtZVVSTCgpIGNvbnN0Owog CiAgICAgV2ViUGFnZSogbV93ZWJQYWdlOwogICAgIEdSZWZQdHI8R3RrUHJpbnRTZXR0aW5ncz4g bV9wcmludFNldHRpbmdzOwo= 221278 2014-01-15 09:35:22 -0800 2014-01-15 13:27:07 -0800 Rebased wk-print-errors.diff text/plain 16259 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkMmNiZTI3Li40NDUyYjVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTQtMDEtMTUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdW0VGTF1bTklYXSBEbyBub3QgdXNlIFByaW50Q29udGV4dCwgRnJh bWUgYW5kIERvY3VtZW50TG9hZGVyIGluIEVycm9ycworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3MDQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVXNpbmcgUHJpbnRDb250ZXh0LCBGcmFtZSBhbmQgRG9j dW1lbnRMb2FkZXIgaW4gcGxhdGZvcm0gaXMgYQorICAgICAgICBsYXllcmluZyB2aW9sYXRpb24u CisgICAgICAgIENoYW5nZSBwcmludGluZyBlcnJvciBtZXRob2RzIHRvIHJlY2VpdmUgYSBmYWls aW5nIFVSTCBpbnN0ZWFkIG9mCisgICAgICAgIHJlY2VpdmluZyBhIFByaW50Q29udGV4dCB0aGF0 IHdhcyB1c2VkIG9ubHkgdG8gZ2V0IHRoZSBmYWlsaW5nCisgICAgICAgIFVSTC4KKworICAgICAg ICAqIHBsYXRmb3JtL2VmbC9FcnJvcnNFZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cHJpbnRF cnJvcik6CisgICAgICAgIChXZWJDb3JlOjpwcmludGVyTm90Rm91bmRFcnJvcik6CisgICAgICAg IChXZWJDb3JlOjppbnZhbGlkUGFnZVJhbmdlVG9QcmludCk6CisgICAgICAgICogcGxhdGZvcm0v ZWZsL0Vycm9yc0VmbC5oOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9FcnJvcnNHdGsuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6cHJpbnRFcnJvcik6CisgICAgICAgIChXZWJDb3JlOjpwcmludGVy Tm90Rm91bmRFcnJvcik6CisgICAgICAgIChXZWJDb3JlOjppbnZhbGlkUGFnZVJhbmdlVG9Qcmlu dCk6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL0Vycm9yc0d0ay5oOgorICAgICAgICAqIHBsYXRm b3JtL25peC9FcnJvcnNOaXguY3BwOgorICAgICAgICAoV2ViQ29yZTo6cHJpbnRFcnJvcik6Cisg ICAgICAgIChXZWJDb3JlOjpwcmludGVyTm90Rm91bmRFcnJvcik6CisgICAgICAgIChXZWJDb3Jl OjppbnZhbGlkUGFnZVJhbmdlVG9QcmludCk6CisgICAgICAgICogcGxhdGZvcm0vbml4L0Vycm9y c05peC5oOgorCiAyMDE0LTAxLTE1ICBab2x0YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQub3Jn PgogCiAgICAgICAgIFdvcmRNZWFzdXJlbWVudCBpcyBhIHN0cnVjdCwgbm90IGEgY2xhc3MKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9FcnJvcnNFZmwuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL0Vycm9yc0VmbC5jcHAKaW5kZXggZGEyZTIzZC4uZWRj OTA4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL0Vycm9yc0VmbC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL0Vycm9yc0VmbC5jcHAKQEAgLTI2 LDEwICsyNiw2IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiRXJyb3JzRWZsLmgi CiAKLSNpbmNsdWRlICJEb2N1bWVudExvYWRlci5oIgotI2luY2x1ZGUgIkZyYW1lLmgiCi0jaW5j bHVkZSAiRnJhbWVMb2FkZXIuaCIKLSNpbmNsdWRlICJQcmludENvbnRleHQuaCIKICNpbmNsdWRl ICJSZXNvdXJjZUVycm9yLmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VSZXF1ZXN0LmgiCiAjaW5jbHVk ZSAiUmVzb3VyY2VSZXNwb25zZS5oIgpAQCAtODYsMjUgKzgyLDE5IEBAIFJlc291cmNlRXJyb3Ig ZG93bmxvYWREZXN0aW5hdGlvbkVycm9yKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNl LCBjb25zdCBTCiAgICAgcmV0dXJuIFJlc291cmNlRXJyb3IoZXJyb3JEb21haW5Eb3dubG9hZCwg RG93bmxvYWRFcnJvckRlc3RpbmF0aW9uLCByZXNwb25zZS51cmwoKS5zdHJpbmcoKSwgZXJyb3JN ZXNzYWdlKTsKIH0KIAotUmVzb3VyY2VFcnJvciBwcmludEVycm9yKGNvbnN0IFByaW50Q29udGV4 dCogcHJpbnRDb250ZXh0LCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSkKK1Jlc291cmNlRXJy b3IgcHJpbnRFcnJvcihjb25zdCBVUkwmIGZhaWxpbmdVUkwsIGNvbnN0IFN0cmluZyYgZXJyb3JN ZXNzYWdlKQogewotICAgIERvY3VtZW50TG9hZGVyKiBkb2N1bWVudExvYWRlciA9IHByaW50Q29u dGV4dC0+ZnJhbWUoKS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKTsKLQotICAgIHJldHVybiBS ZXNvdXJjZUVycm9yKGVycm9yRG9tYWluUHJpbnQsIFByaW50RXJyb3JHZW5lcmFsLCBkb2N1bWVu dExvYWRlciA/IGRvY3VtZW50TG9hZGVyLT51cmwoKSA6IFVSTCgpLCBlcnJvck1lc3NhZ2UpOwor ICAgIHJldHVybiBSZXNvdXJjZUVycm9yKGVycm9yRG9tYWluUHJpbnQsIFByaW50RXJyb3JHZW5l cmFsLCBmYWlsaW5nVVJMLCBlcnJvck1lc3NhZ2UpOwogfQogCi1SZXNvdXJjZUVycm9yIHByaW50 ZXJOb3RGb3VuZEVycm9yKGNvbnN0IFByaW50Q29udGV4dCogcHJpbnRDb250ZXh0KQorUmVzb3Vy Y2VFcnJvciBwcmludGVyTm90Rm91bmRFcnJvcihjb25zdCBVUkwmIGZhaWxpbmdVUkwpCiB7Ci0g ICAgRG9jdW1lbnRMb2FkZXIqIGRvY3VtZW50TG9hZGVyID0gcHJpbnRDb250ZXh0LT5mcmFtZSgp LT5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpOwotCi0gICAgcmV0dXJuIFJlc291cmNlRXJyb3Io ZXJyb3JEb21haW5QcmludCwgUHJpbnRFcnJvclByaW50ZXJOb3RGb3VuZCwgZG9jdW1lbnRMb2Fk ZXIgPyBkb2N1bWVudExvYWRlci0+dXJsKCkgOiBVUkwoKSwgQVNDSUlMaXRlcmFsKCJQcmludGVy IG5vdCBmb3VuZCIpKTsKKyAgICByZXR1cm4gUmVzb3VyY2VFcnJvcihlcnJvckRvbWFpblByaW50 LCBQcmludEVycm9yUHJpbnRlck5vdEZvdW5kLCBmYWlsaW5nVVJMLCBBU0NJSUxpdGVyYWwoIlBy aW50ZXIgbm90IGZvdW5kIikpOwogfQogCi1SZXNvdXJjZUVycm9yIGludmFsaWRQYWdlUmFuZ2VU b1ByaW50KGNvbnN0IFByaW50Q29udGV4dCogcHJpbnRDb250ZXh0KQorUmVzb3VyY2VFcnJvciBp bnZhbGlkUGFnZVJhbmdlVG9QcmludChjb25zdCBVUkwmIGZhaWxpbmdVUkwpCiB7Ci0gICAgRG9j dW1lbnRMb2FkZXIqIGRvY3VtZW50TG9hZGVyID0gcHJpbnRDb250ZXh0LT5mcmFtZSgpLT5sb2Fk ZXIoKS5kb2N1bWVudExvYWRlcigpOwotCi0gICAgcmV0dXJuIFJlc291cmNlRXJyb3IoZXJyb3JE b21haW5QcmludCwgUHJpbnRFcnJvckludmFsaWRQYWdlUmFuZ2UsIGRvY3VtZW50TG9hZGVyID8g ZG9jdW1lbnRMb2FkZXItPnVybCgpIDogVVJMKCksIEFTQ0lJTGl0ZXJhbCgiSW52YWxpZCBwYWdl IHJhbmdlIikpOworICAgIHJldHVybiBSZXNvdXJjZUVycm9yKGVycm9yRG9tYWluUHJpbnQsIFBy aW50RXJyb3JJbnZhbGlkUGFnZVJhbmdlLCBmYWlsaW5nVVJMLCBBU0NJSUxpdGVyYWwoIkludmFs aWQgcGFnZSByYW5nZSIpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL0Vycm9yc0VmbC5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZWZsL0Vycm9yc0VmbC5oCmluZGV4IDAyOWYwZDYuLjE0N2JhZmYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9FcnJvcnNFZmwuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvRXJyb3JzRWZsLmgKQEAgLTMwLDEwICszMCwxMCBAQAog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNzIFByaW50Q29udGV4dDsKIGNsYXNzIFJlc291 cmNlRXJyb3I7CiBjbGFzcyBSZXNvdXJjZVJlcXVlc3Q7CiBjbGFzcyBSZXNvdXJjZVJlc3BvbnNl OworY2xhc3MgVVJMOwogCiBzdGF0aWMgY29uc3QgY2hhciBlcnJvckRvbWFpbk5ldHdvcmtbXSA9 ICJXZWJLaXROZXR3b3JrRXJyb3IiOwogc3RhdGljIGNvbnN0IGNoYXIgZXJyb3JEb21haW5Qb2xp Y3lbXSA9ICJXZWJLaXRQb2xpY3lFcnJvciI7CkBAIC05MCw5ICs5MCw5IEBAIFJlc291cmNlRXJy b3IgcGx1Z2luV2lsbEhhbmRsZUxvYWRFcnJvcihjb25zdCBSZXNvdXJjZVJlc3BvbnNlJik7CiBS ZXNvdXJjZUVycm9yIGRvd25sb2FkTmV0d29ya0Vycm9yKGNvbnN0IFJlc291cmNlRXJyb3ImKTsK IFJlc291cmNlRXJyb3IgZG93bmxvYWRDYW5jZWxsZWRCeVVzZXJFcnJvcihjb25zdCBSZXNvdXJj ZVJlc3BvbnNlJik7CiBSZXNvdXJjZUVycm9yIGRvd25sb2FkRGVzdGluYXRpb25FcnJvcihjb25z dCBSZXNvdXJjZVJlc3BvbnNlJiwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpOwotUmVzb3Vy Y2VFcnJvciBwcmludEVycm9yKGNvbnN0IFByaW50Q29udGV4dCosIGNvbnN0IFN0cmluZyYgZXJy b3JNZXNzYWdlKTsKLVJlc291cmNlRXJyb3IgcHJpbnRlck5vdEZvdW5kRXJyb3IoY29uc3QgUHJp bnRDb250ZXh0Kik7Ci1SZXNvdXJjZUVycm9yIGludmFsaWRQYWdlUmFuZ2VUb1ByaW50KGNvbnN0 IFByaW50Q29udGV4dCopOworUmVzb3VyY2VFcnJvciBwcmludEVycm9yKGNvbnN0IFVSTCYgZmFp bGluZ1VSTCwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpOworUmVzb3VyY2VFcnJvciBwcmlu dGVyTm90Rm91bmRFcnJvcihjb25zdCBVUkwmIGZhaWxpbmdVUkwpOworUmVzb3VyY2VFcnJvciBp bnZhbGlkUGFnZVJhbmdlVG9QcmludChjb25zdCBVUkwmIGZhaWxpbmdVUkwpOwogCiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9FcnJvcnNHdGsuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0Vycm9yc0d0ay5jcHAKaW5kZXggM2NmNmIwMC4uNjk1 NTgxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0Vycm9yc0d0ay5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0Vycm9yc0d0ay5jcHAKQEAgLTIw LDEwICsyMCw2IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiRXJyb3JzR3RrLmgi CiAKLSNpbmNsdWRlICJEb2N1bWVudExvYWRlci5oIgotI2luY2x1ZGUgIkZyYW1lLmgiCi0jaW5j bHVkZSAiRnJhbWVMb2FkZXIuaCIKLSNpbmNsdWRlICJQcmludENvbnRleHQuaCIKICNpbmNsdWRl ICJSZXNvdXJjZUVycm9yLmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VSZXF1ZXN0LmgiCiAjaW5jbHVk ZSAiUmVzb3VyY2VSZXNwb25zZS5oIgpAQCAtOTEsMjUgKzg3LDE5IEBAIFJlc291cmNlRXJyb3Ig ZG93bmxvYWREZXN0aW5hdGlvbkVycm9yKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNl LCBjb25zdCBTCiAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzcG9uc2UudXJsKCkuc3RyaW5n KCksIGVycm9yTWVzc2FnZSk7CiB9CiAKLVJlc291cmNlRXJyb3IgcHJpbnRFcnJvcihjb25zdCBQ cmludENvbnRleHQqIHByaW50Q29udGV4dCwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpCitS ZXNvdXJjZUVycm9yIHByaW50RXJyb3IoY29uc3QgVVJMJiBmYWlsaW5nVVJMLCBjb25zdCBTdHJp bmcmIGVycm9yTWVzc2FnZSkKIHsKLSAgICBEb2N1bWVudExvYWRlciogZG9jdW1lbnRMb2FkZXIg PSBwcmludENvbnRleHQtPmZyYW1lKCktPmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCk7Ci0gICAg cmV0dXJuIFJlc291cmNlRXJyb3IoZXJyb3JEb21haW5QcmludCwgUHJpbnRFcnJvckdlbmVyYWws Ci0gICAgICAgICAgICAgICAgICAgICAgICAgZG9jdW1lbnRMb2FkZXIgPyBkb2N1bWVudExvYWRl ci0+dXJsKCkgOiBVUkwoKSwgZXJyb3JNZXNzYWdlKTsKKyAgICByZXR1cm4gUmVzb3VyY2VFcnJv cihlcnJvckRvbWFpblByaW50LCBQcmludEVycm9yR2VuZXJhbCwgZmFpbGluZ1VSTCwgZXJyb3JN ZXNzYWdlKTsKIH0KIAotUmVzb3VyY2VFcnJvciBwcmludGVyTm90Rm91bmRFcnJvcihjb25zdCBQ cmludENvbnRleHQqIHByaW50Q29udGV4dCkKK1Jlc291cmNlRXJyb3IgcHJpbnRlck5vdEZvdW5k RXJyb3IoY29uc3QgVVJMJiBmYWlsaW5nVVJMKQogewotICAgIERvY3VtZW50TG9hZGVyKiBkb2N1 bWVudExvYWRlciA9IHByaW50Q29udGV4dC0+ZnJhbWUoKS0+bG9hZGVyKCkuZG9jdW1lbnRMb2Fk ZXIoKTsKLSAgICByZXR1cm4gUmVzb3VyY2VFcnJvcihlcnJvckRvbWFpblByaW50LCBQcmludEVy cm9yUHJpbnRlck5vdEZvdW5kLAotICAgICAgICAgICAgICAgICAgICAgICAgIGRvY3VtZW50TG9h ZGVyID8gZG9jdW1lbnRMb2FkZXItPnVybCgpIDogVVJMKCksIF8oIlByaW50ZXIgbm90IGZvdW5k IikpOworICAgIHJldHVybiBSZXNvdXJjZUVycm9yKGVycm9yRG9tYWluUHJpbnQsIFByaW50RXJy b3JQcmludGVyTm90Rm91bmQsIGZhaWxpbmdVUkwsIF8oIlByaW50ZXIgbm90IGZvdW5kIikpOwog fQogCi1SZXNvdXJjZUVycm9yIGludmFsaWRQYWdlUmFuZ2VUb1ByaW50KGNvbnN0IFByaW50Q29u dGV4dCogcHJpbnRDb250ZXh0KQorUmVzb3VyY2VFcnJvciBpbnZhbGlkUGFnZVJhbmdlVG9Qcmlu dChjb25zdCBVUkwmIGZhaWxpbmdVUkwpCiB7Ci0gICAgRG9jdW1lbnRMb2FkZXIqIGRvY3VtZW50 TG9hZGVyID0gcHJpbnRDb250ZXh0LT5mcmFtZSgpLT5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigp OwotICAgIHJldHVybiBSZXNvdXJjZUVycm9yKGVycm9yRG9tYWluUHJpbnQsIFByaW50RXJyb3JJ bnZhbGlkUGFnZVJhbmdlLAotICAgICAgICAgICAgICAgICAgICAgICAgIGRvY3VtZW50TG9hZGVy ID8gZG9jdW1lbnRMb2FkZXItPnVybCgpIDogVVJMKCksIF8oIkludmFsaWQgcGFnZSByYW5nZSIp KTsKKyAgICByZXR1cm4gUmVzb3VyY2VFcnJvcihlcnJvckRvbWFpblByaW50LCBQcmludEVycm9y SW52YWxpZFBhZ2VSYW5nZSwgZmFpbGluZ1VSTCwgXygiSW52YWxpZCBwYWdlIHJhbmdlIikpOwog fQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ndGsvRXJyb3JzR3RrLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvRXJy b3JzR3RrLmgKaW5kZXggNTgyY2M5OS4uMGMxNDcxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3RrL0Vycm9yc0d0ay5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2d0ay9FcnJvcnNHdGsuaApAQCAtMjQsMTAgKzI0LDEwIEBACiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAotY2xhc3MgUHJpbnRDb250ZXh0OwogY2xhc3MgUmVzb3VyY2VFcnJvcjsKIGNsYXNzIFJl c291cmNlUmVxdWVzdDsKIGNsYXNzIFJlc291cmNlUmVzcG9uc2U7CitjbGFzcyBVUkw7CiAKIGNv bnN0IGNoYXIqIGNvbnN0IGVycm9yRG9tYWluTmV0d29yayA9ICJXZWJLaXROZXR3b3JrRXJyb3Ii OwogY29uc3QgY2hhciogY29uc3QgZXJyb3JEb21haW5Qb2xpY3kgPSAiV2ViS2l0UG9saWN5RXJy b3IiOwpAQCAtODMsOSArODMsOSBAQCBSZXNvdXJjZUVycm9yIHBsdWdpbldpbGxIYW5kbGVMb2Fk RXJyb3IoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYpOwogUmVzb3VyY2VFcnJvciBkb3dubG9hZE5l dHdvcmtFcnJvcihjb25zdCBSZXNvdXJjZUVycm9yJik7CiBSZXNvdXJjZUVycm9yIGRvd25sb2Fk Q2FuY2VsbGVkQnlVc2VyRXJyb3IoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYpOwogUmVzb3VyY2VF cnJvciBkb3dubG9hZERlc3RpbmF0aW9uRXJyb3IoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYsIGNv bnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKTsKLVJlc291cmNlRXJyb3IgcHJpbnRFcnJvcihjb25z dCBQcmludENvbnRleHQqLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSk7Ci1SZXNvdXJjZUVy cm9yIHByaW50ZXJOb3RGb3VuZEVycm9yKGNvbnN0IFByaW50Q29udGV4dCopOwotUmVzb3VyY2VF cnJvciBpbnZhbGlkUGFnZVJhbmdlVG9QcmludChjb25zdCBQcmludENvbnRleHQqKTsKK1Jlc291 cmNlRXJyb3IgcHJpbnRFcnJvcihjb25zdCBVUkwmIGZhaWxpbmdVUkwsIGNvbnN0IFN0cmluZyYg ZXJyb3JNZXNzYWdlKTsKK1Jlc291cmNlRXJyb3IgcHJpbnRlck5vdEZvdW5kRXJyb3IoY29uc3Qg VVJMJiBmYWlsaW5nVVJMKTsKK1Jlc291cmNlRXJyb3IgaW52YWxpZFBhZ2VSYW5nZVRvUHJpbnQo Y29uc3QgVVJMJiBmYWlsaW5nVVJMKTsKIAogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uaXgvRXJyb3JzTml4LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25p eC9FcnJvcnNOaXguY3BwCmluZGV4IDQ5MjliZTQuLmE5OTRiNTYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25peC9FcnJvcnNOaXguY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25peC9FcnJvcnNOaXguY3BwCkBAIC0yNyw5ICsyNyw2IEBACiAjaW5jbHVkZSAi Y29uZmlnLmgiCiAjaW5jbHVkZSAiRXJyb3JzTml4LmgiCiAKLSNpbmNsdWRlICJEb2N1bWVudExv YWRlci5oIgotI2luY2x1ZGUgIkZyYW1lLmgiCi0jaW5jbHVkZSAiUHJpbnRDb250ZXh0LmgiCiAj aW5jbHVkZSAiUmVzb3VyY2VFcnJvci5oIgogI2luY2x1ZGUgIlJlc291cmNlUmVxdWVzdC5oIgog I2luY2x1ZGUgIlJlc291cmNlUmVzcG9uc2UuaCIKQEAgLTg2LDI1ICs4MywxOSBAQCBSZXNvdXJj ZUVycm9yIGRvd25sb2FkRGVzdGluYXRpb25FcnJvcihjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiBy ZXNwb25zZSwgY29uc3QgUwogICAgIHJldHVybiBSZXNvdXJjZUVycm9yKGVycm9yRG9tYWluRG93 bmxvYWQsIERvd25sb2FkRXJyb3JEZXN0aW5hdGlvbiwgcmVzcG9uc2UudXJsKCkuc3RyaW5nKCks IGVycm9yTWVzc2FnZSk7CiB9CiAKLVJlc291cmNlRXJyb3IgcHJpbnRFcnJvcihjb25zdCBQcmlu dENvbnRleHQqIHByaW50Q29udGV4dCwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpCitSZXNv dXJjZUVycm9yIHByaW50RXJyb3IoY29uc3QgVVJMJiBmYWlsaW5nVVJMLCBjb25zdCBTdHJpbmcm IGVycm9yTWVzc2FnZSkKIHsKLSAgICBEb2N1bWVudExvYWRlciogZG9jdW1lbnRMb2FkZXIgPSBw cmludENvbnRleHQtPmZyYW1lKCktPmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCk7Ci0KLSAgICBy ZXR1cm4gUmVzb3VyY2VFcnJvcihlcnJvckRvbWFpblByaW50LCBQcmludEVycm9yR2VuZXJhbCwg ZG9jdW1lbnRMb2FkZXIgPyBkb2N1bWVudExvYWRlci0+dXJsKCkgOiBVUkwoKSwgZXJyb3JNZXNz YWdlKTsKKyAgICByZXR1cm4gUmVzb3VyY2VFcnJvcihlcnJvckRvbWFpblByaW50LCBQcmludEVy cm9yR2VuZXJhbCwgZmFpbGluZ1VSTCwgZXJyb3JNZXNzYWdlKTsKIH0KIAotUmVzb3VyY2VFcnJv ciBwcmludGVyTm90Rm91bmRFcnJvcihjb25zdCBQcmludENvbnRleHQqIHByaW50Q29udGV4dCkK K1Jlc291cmNlRXJyb3IgcHJpbnRlck5vdEZvdW5kRXJyb3IoY29uc3QgVVJMJiBmYWlsaW5nVVJM KQogewotICAgIERvY3VtZW50TG9hZGVyKiBkb2N1bWVudExvYWRlciA9IHByaW50Q29udGV4dC0+ ZnJhbWUoKS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKTsKLQotICAgIHJldHVybiBSZXNvdXJj ZUVycm9yKGVycm9yRG9tYWluUHJpbnQsIFByaW50RXJyb3JQcmludGVyTm90Rm91bmQsIGRvY3Vt ZW50TG9hZGVyID8gZG9jdW1lbnRMb2FkZXItPnVybCgpIDogVVJMKCksIEFTQ0lJTGl0ZXJhbCgi UHJpbnRlciBub3QgZm91bmQiKSk7CisgICAgcmV0dXJuIFJlc291cmNlRXJyb3IoZXJyb3JEb21h aW5QcmludCwgUHJpbnRFcnJvclByaW50ZXJOb3RGb3VuZCwgZmFpbGluZ1VSTCwgQVNDSUlMaXRl cmFsKCJQcmludGVyIG5vdCBmb3VuZCIpKTsKIH0KIAotUmVzb3VyY2VFcnJvciBpbnZhbGlkUGFn ZVJhbmdlVG9QcmludChjb25zdCBQcmludENvbnRleHQqIHByaW50Q29udGV4dCkKK1Jlc291cmNl RXJyb3IgaW52YWxpZFBhZ2VSYW5nZVRvUHJpbnQoY29uc3QgVVJMJiBmYWlsaW5nVVJMKQogewot ICAgIERvY3VtZW50TG9hZGVyKiBkb2N1bWVudExvYWRlciA9IHByaW50Q29udGV4dC0+ZnJhbWUo KS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKTsKLQotICAgIHJldHVybiBSZXNvdXJjZUVycm9y KGVycm9yRG9tYWluUHJpbnQsIFByaW50RXJyb3JJbnZhbGlkUGFnZVJhbmdlLCBkb2N1bWVudExv YWRlciA/IGRvY3VtZW50TG9hZGVyLT51cmwoKSA6IFVSTCgpLCBBU0NJSUxpdGVyYWwoIkludmFs aWQgcGFnZSByYW5nZSIpKTsKKyAgICByZXR1cm4gUmVzb3VyY2VFcnJvcihlcnJvckRvbWFpblBy aW50LCBQcmludEVycm9ySW52YWxpZFBhZ2VSYW5nZSwgZmFpbGluZ1VSTCwgQVNDSUlMaXRlcmFs KCJJbnZhbGlkIHBhZ2UgcmFuZ2UiKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25peC9FcnJvcnNOaXguaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25peC9FcnJvcnNOaXguaAppbmRleCBjNzFiMGVjLi4xZTk1YjFk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uaXgvRXJyb3JzTml4LmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbml4L0Vycm9yc05peC5oCkBAIC0zMSwxMCArMzEs MTAgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1jbGFzcyBQcmludENvbnRleHQ7CiBjbGFz cyBSZXNvdXJjZUVycm9yOwogY2xhc3MgUmVzb3VyY2VSZXF1ZXN0OwogY2xhc3MgUmVzb3VyY2VS ZXNwb25zZTsKK2NsYXNzIFVSTDsKIAogc3RhdGljIGNvbnN0IGNoYXIgZXJyb3JEb21haW5OZXR3 b3JrW10gPSAiV2ViS2l0TmV0d29ya0Vycm9yIjsKIHN0YXRpYyBjb25zdCBjaGFyIGVycm9yRG9t YWluUG9saWN5W10gPSAiV2ViS2l0UG9saWN5RXJyb3IiOwpAQCAtOTEsOSArOTEsOSBAQCBSZXNv dXJjZUVycm9yIHBsdWdpbldpbGxIYW5kbGVMb2FkRXJyb3IoY29uc3QgUmVzb3VyY2VSZXNwb25z ZSYpOwogUmVzb3VyY2VFcnJvciBkb3dubG9hZE5ldHdvcmtFcnJvcihjb25zdCBSZXNvdXJjZUVy cm9yJik7CiBSZXNvdXJjZUVycm9yIGRvd25sb2FkQ2FuY2VsbGVkQnlVc2VyRXJyb3IoY29uc3Qg UmVzb3VyY2VSZXNwb25zZSYpOwogUmVzb3VyY2VFcnJvciBkb3dubG9hZERlc3RpbmF0aW9uRXJy b3IoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKTsK LVJlc291cmNlRXJyb3IgcHJpbnRFcnJvcihjb25zdCBQcmludENvbnRleHQqLCBjb25zdCBTdHJp bmcmIGVycm9yTWVzc2FnZSk7Ci1SZXNvdXJjZUVycm9yIHByaW50ZXJOb3RGb3VuZEVycm9yKGNv bnN0IFByaW50Q29udGV4dCopOwotUmVzb3VyY2VFcnJvciBpbnZhbGlkUGFnZVJhbmdlVG9Qcmlu dChjb25zdCBQcmludENvbnRleHQqKTsKK1Jlc291cmNlRXJyb3IgcHJpbnRFcnJvcihjb25zdCBV UkwmIGZhaWxpbmdVUkwsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKTsKK1Jlc291cmNlRXJy b3IgcHJpbnRlck5vdEZvdW5kRXJyb3IoY29uc3QgVVJMJiBmYWlsaW5nVVJMKTsKK1Jlc291cmNl RXJyb3IgaW52YWxpZFBhZ2VSYW5nZVRvUHJpbnQoY29uc3QgVVJMJiBmYWlsaW5nVVJMKTsKIAog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjFmNGJmMi4uY2MxNzZhNSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDE0LTAxLTE1ICBDYXJsb3MgR2FyY2lhIENh bXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAorICAgICAgICBbR1RLXVtFRkxdW05JWF0gRG8g bm90IHVzZSBQcmludENvbnRleHQsIEZyYW1lIGFuZCBEb2N1bWVudExvYWRlciBpbiBFcnJvcnMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzA0Nwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQYWdlL2d0ay9XZWJQcmludE9wZXJhdGlvbkd0ay5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlByaW50T3BlcmF0aW9uR3RrOjpmcmFtZVVSTCk6IEhlbHBlciBmdW5jdGlvbiB0byBn ZXQKKyAgICAgICAgdGhlIFVSTCBvZiB0aGUgZnJhbWUgYmVpbmcgcHJpbnRlZC4KKyAgICAgICAg KFdlYktpdDo6V2ViUHJpbnRPcGVyYXRpb25HdGs6OnByaW50KTogVXNlIGZyYW1lVVJMKCkgYXMg ZmFpbGluZworICAgICAgICBVUkwgZm9yIHByaW50aW5nIGVycm9ycy4KKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlByaW50T3BlcmF0aW9uR3RrLmg6CisKKzIwMTQtMDEtMTUg IENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAgICAgICAgIFtH VEtdIFdlYiBwcm9jZXNzIHNvbWV0aW1lcyBjcmFzaGVzIHdoZW4gcHJpbnRpbmcgaW4gc3luY2hy b25vdXMgbW9kZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTI2OTc5CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9ndGsvV2ViUHJpbnRPcGVyYXRpb25HdGsuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL2d0ay9XZWJQcmludE9wZXJhdGlvbkd0ay5jcHAKaW5kZXggN2Y3NTBlOC4uYjFl YjE1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9X ZWJQcmludE9wZXJhdGlvbkd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL2d0ay9XZWJQcmludE9wZXJhdGlvbkd0ay5jcHAKQEAgLTI5LDEyICsyOSwxNSBAQAog I2luY2x1ZGUgIldlYkNvcmVBcmd1bWVudENvZGVycy5oIgogI2luY2x1ZGUgIldlYlBhZ2UuaCIK ICNpbmNsdWRlICJXZWJQYWdlUHJveHlNZXNzYWdlcy5oIgorI2luY2x1ZGUgPFdlYkNvcmUvRG9j dW1lbnRMb2FkZXIuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0Vycm9yc0d0ay5oPgorI2luY2x1ZGUg PFdlYkNvcmUvRnJhbWUuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0ludFJlY3QuaD4KICNpbmNsdWRl IDxXZWJDb3JlL05vdEltcGxlbWVudGVkLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QbGF0Zm9ybUNv bnRleHRDYWlyby5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUHJpbnRDb250ZXh0Lmg+CiAjaW5jbHVk ZSA8V2ViQ29yZS9SZXNvdXJjZUVycm9yLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9VUkwuaD4KICNp bmNsdWRlIDxndGsvZ3RrLmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogI2luY2x1ZGUgPHd0 Zi9nb2JqZWN0L0dPd25QdHIuaD4KQEAgLTY2LDcgKzY5LDcgQEAgcHVibGljOgogICAgICAgICBj b25zdCBjaGFyKiBwcmludGVyTmFtZSA9IGd0a19wcmludF9zZXR0aW5nc19nZXRfcHJpbnRlciht X3ByaW50U2V0dGluZ3MuZ2V0KCkpOwogICAgICAgICBHdGtQcmludGVyKiBwcmludGVyID0gcHJp bnRlck5hbWUgPyBwcmludGVyTGlzdC0+ZmluZFByaW50ZXIocHJpbnRlck5hbWUpIDogcHJpbnRl ckxpc3QtPmRlZmF1bHRQcmludGVyKCk7CiAgICAgICAgIGlmICghcHJpbnRlcikgewotICAgICAg ICAgICAgcHJpbnREb25lKHByaW50ZXJOb3RGb3VuZEVycm9yKG1fcHJpbnRDb250ZXh0KSk7Cisg ICAgICAgICAgICBwcmludERvbmUocHJpbnRlck5vdEZvdW5kRXJyb3IoZnJhbWVVUkwoKSkpOwog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKQEAgLTc4LDcgKzgxLDcgQEAgcHVibGlj OgogICAgICAgICBHT3duUHRyPEdFcnJvcj4gZXJyb3I7CiAgICAgICAgIGNhaXJvX3N1cmZhY2Vf dCogc3VyZmFjZSA9IGd0a19wcmludF9qb2JfZ2V0X3N1cmZhY2UobV9wcmludEpvYi5nZXQoKSwg JmVycm9yLm91dFB0cigpKTsKICAgICAgICAgaWYgKCFzdXJmYWNlKSB7Ci0gICAgICAgICAgICBw cmludERvbmUocHJpbnRFcnJvcihtX3ByaW50Q29udGV4dCwgZXJyb3ItPm1lc3NhZ2UpKTsKKyAg ICAgICAgICAgIHByaW50RG9uZShwcmludEVycm9yKGZyYW1lVVJMKCksIGVycm9yLT5tZXNzYWdl KSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIApAQCAtMTM3LDcgKzE0MCw3IEBA IHB1YmxpYzoKIAogICAgIHN0YXRpYyB2b2lkIHByaW50Sm9iQ29tcGxldGUoR3RrUHJpbnRKb2Iq IHByaW50Sm9iLCBXZWJQcmludE9wZXJhdGlvbkd0a1VuaXgqIHByaW50T3BlcmF0aW9uLCBjb25z dCBHRXJyb3IqIGVycm9yKQogICAgIHsKLSAgICAgICAgcHJpbnRPcGVyYXRpb24tPnByaW50RG9u ZShlcnJvciA/IHByaW50RXJyb3IocHJpbnRPcGVyYXRpb24tPm1fcHJpbnRDb250ZXh0LCBlcnJv ci0+bWVzc2FnZSkgOiBXZWJDb3JlOjpSZXNvdXJjZUVycm9yKCkpOworICAgICAgICBwcmludE9w ZXJhdGlvbi0+cHJpbnREb25lKGVycm9yID8gcHJpbnRFcnJvcihwcmludE9wZXJhdGlvbi0+ZnJh bWVVUkwoKSwgZXJyb3ItPm1lc3NhZ2UpIDogV2ViQ29yZTo6UmVzb3VyY2VFcnJvcigpKTsKICAg ICAgICAgcHJpbnRPcGVyYXRpb24tPm1fcHJpbnRKb2IgPSAwOwogICAgIH0KIApAQCAtNDI3LDYg KzQzMCwxNSBAQCBib29sIFdlYlByaW50T3BlcmF0aW9uR3RrOjpjdXJyZW50UGFnZUlzTGFzdFBh Z2VPZlNoZWV0KCkgY29uc3QKICAgICByZXR1cm4gKG1fbnVtYmVyVXAgPCAyIHx8ICEoKG1fcGFn ZVBvc2l0aW9uICsgMSkgJSBtX251bWJlclVwKSB8fCBtX3BhZ2VQb3NpdGlvbiA9PSBtX251bWJl ck9mUGFnZXNUb1ByaW50IC0gMSk7CiB9CiAKK1dlYkNvcmU6OlVSTCBXZWJQcmludE9wZXJhdGlv bkd0azo6ZnJhbWVVUkwoKSBjb25zdAoreworICAgIGlmICghbV9wcmludENvbnRleHQpCisgICAg ICAgIHJldHVybiBXZWJDb3JlOjpVUkwoKTsKKworICAgIFdlYkNvcmU6OkRvY3VtZW50TG9hZGVy KiBkb2N1bWVudExvYWRlciA9IG1fcHJpbnRDb250ZXh0LT5mcmFtZSgpLT5sb2FkZXIoKS5kb2N1 bWVudExvYWRlcigpOworICAgIHJldHVybiBkb2N1bWVudExvYWRlciA/IGRvY3VtZW50TG9hZGVy LT51cmwoKSA6IFdlYkNvcmU6OlVSTCgpOworfQorCiB2b2lkIFdlYlByaW50T3BlcmF0aW9uR3Rr Ojpyb3RhdGVQYWdlSWZOZWVkZWQoKQogewogICAgIGlmICghbV9uZWVkc1JvdGF0aW9uKQpAQCAt NjkzLDcgKzcwNSw3IEBAIHZvaWQgV2ViUHJpbnRPcGVyYXRpb25HdGs6OnByaW50KGNhaXJvX3N1 cmZhY2VfdCogc3VyZmFjZSwgZG91YmxlIHhEUEksIGRvdWJsZSB5CiAgICAgT3duUHRyPFByaW50 UGFnZXNEYXRhPiBkYXRhID0gYWRvcHRQdHIobmV3IFByaW50UGFnZXNEYXRhKHRoaXMpKTsKICAg ICBpZiAoIWRhdGEtPmlzVmFsaWQpIHsKICAgICAgICAgY2Fpcm9fc3VyZmFjZV9maW5pc2goc3Vy ZmFjZSk7Ci0gICAgICAgIHByaW50RG9uZShpbnZhbGlkUGFnZVJhbmdlVG9QcmludChtX3ByaW50 Q29udGV4dCkpOworICAgICAgICBwcmludERvbmUoaW52YWxpZFBhZ2VSYW5nZVRvUHJpbnQoZnJh bWVVUkwoKSkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlByaW50T3BlcmF0aW9uR3RrLmggYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlByaW50T3BlcmF0aW9uR3Rr LmgKaW5kZXggYTg4NDAzOS4uNDM4ZjM0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL2d0ay9XZWJQcmludE9wZXJhdGlvbkd0ay5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUHJpbnRPcGVyYXRpb25HdGsuaApAQCAt MzksNiArMzksNyBAQCB0eXBlZGVmIHN0cnVjdCBfR3RrUGFnZVJhbmdlIEd0a1BhZ2VSYW5nZTsK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIFByaW50Q29udGV4dDsKIGNsYXNzIFJlc291cmNl RXJyb3I7CitjbGFzcyBVUkw7CiB9OwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTkyLDYgKzkz LDcgQEAgcHJvdGVjdGVkOgogICAgIHZvaWQgcHJlcGFyZUNvbnRleHRUb0RyYXcoKTsKICAgICB2 b2lkIHByaW50UGFnZXNEb25lKCk7CiAgICAgdm9pZCBwcmludERvbmUoY29uc3QgV2ViQ29yZTo6 UmVzb3VyY2VFcnJvciYpOworICAgIFdlYkNvcmU6OlVSTCBmcmFtZVVSTCgpIGNvbnN0OwogCiAg ICAgV2ViUGFnZSogbV93ZWJQYWdlOwogICAgIEdSZWZQdHI8R3RrUHJpbnRTZXR0aW5ncz4gbV9w cmludFNldHRpbmdzOwo=