41661 2010-07-06 00:24:13 -0700 REGRESSION(r62529): http/tests/inspector/resource-har-conversion.html is broken (Requested by yutak on #webkit). 2010-07-06 01:17:19 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 40768 1 webkit.review.bot webkit.review.bot commit-queue hamaji pfeldman tkent oldest_to_newest 246910 0 webkit.review.bot 2010-07-06 00:24:13 -0700 http://trac.webkit.org/changeset/62529 broke the build: http/tests/inspector/resource-har-conversion.html is broken (Requested by yutak on #webkit). This is an automatic bug report generated by the sheriff-bot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests case pain. "Only you can prevent forest fires." -- Smokey the Bear 246911 1 60597 webkit.review.bot 2010-07-06 00:24:23 -0700 Created attachment 60597 ROLLOUT of r62529 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID --ignore-builders where ATTACHMENT_ID is the ID of this attachment. 246926 2 60597 commit-queue 2010-07-06 01:05:20 -0700 Comment on attachment 60597 ROLLOUT of r62529 Rejecting patch 60597 from commit-queue. Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Kent Tamura', u'--force']" exit_code: 1 Last 500 characters of output: .rej patching file WebCore/websockets/WebSocketChannel.cpp Hunk #1 FAILED at 36. Hunk #2 FAILED at 62. Hunk #3 FAILED at 111. Hunk #4 FAILED at 136. Hunk #5 FAILED at 146. Hunk #6 FAILED at 237. Hunk #7 FAILED at 328. 7 out of 7 hunks FAILED -- saving rejects to file WebCore/websockets/WebSocketChannel.cpp.rej patching file WebCore/websockets/WebSocketChannel.h Hunk #1 FAILED at 84. Hunk #2 FAILED at 95. 2 out of 2 hunks FAILED -- saving rejects to file WebCore/websockets/WebSocketChannel.h.rej Full output: http://webkit-commit-queue.appspot.com/results/3381326 246933 3 tkent 2010-07-06 01:17:19 -0700 Committed as r62535 60597 2010-07-06 00:24:23 -0700 2010-07-06 01:16:16 -0700 ROLLOUT of r62529 bug-41661-20100706072421.patch text/plain 31106 webkit.review.bot ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDVhNGFmMGZlZWZlMmJhMDhiOGM1MGRjYWZiMTRjNmI2N2UyMzQ3ZC4uNTA1OWRlMmY5ZjkxMzg5 ZWM0MGMwMGM3NDQ2NTY3YmRhY2EzNDE4NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0NiBAQAorMjAxMC0wNy0wNiAgU2hl cmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CisKKyAgICAgICAgVW5yZXZp ZXdlZCwgcm9sbGluZyBvdXQgcjYyNTI5LgorICAgICAgICBodHRwOi8vdHJhYy53ZWJraXQub3Jn L2NoYW5nZXNldC82MjUyOQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDE2NjEKKworICAgICAgICBodHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZS1o YXItY29udmVyc2lvbi5odG1sIGlzIGJyb2tlbgorICAgICAgICAoUmVxdWVzdGVkIGJ5IHl1dGFr IG9uICN3ZWJraXQpLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6YWRkUmVzb3VyY2Up OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6cmVtb3ZlUmVzb3VyY2Up OgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmg6CisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvclJlc291cmNlOjpJbnNwZWN0b3JSZXNvdXJjZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JSZXNvdXJjZTo6dXBkYXRlU2NyaXB0T2JqZWN0KToKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3RvclJlc291cmNlOjpjYWNoZWRSZXNvdXJjZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JSZXNvdXJjZTo6dHlwZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJj ZTo6cmVzb3VyY2VEYXRhKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2Uu aDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclJlc291cmNlOjopOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yUmVzb3VyY2U6OmNyZWF0ZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9SZXNvdXJjZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBl LnRvU3RyaW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuc2V0 IHR5cGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5fbWltZVR5 cGVJc0NvbnNpc3RlbnRXaXRoVHlwZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9S ZXNvdXJjZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3LnByb3Rv dHlwZS5fcmVmcmVzaFJlcXVlc3RIZWFkZXJzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNv dXJjZVZpZXcucHJvdG90eXBlLl9yZWZyZXNoUmVzcG9uc2VIZWFkZXJzKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5SZXNvdXJjZVZpZXcucHJvdG90eXBlLl9yZWZyZXNoSGVhZGVycyk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzOgorICAgICAgICAoLnJlc291 cmNlcy1jYXRlZ29yeS1zY3JpcHRzLCAucmVzb3VyY2VzLWNhdGVnb3J5LXhociwgLnJlc291cmNl cy1jYXRlZ29yeS1mb250cywgLnJlc291cmNlcy1jYXRlZ29yeS1vdGhlcik6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu bG9hZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci51cGRhdGVSZXNvdXJjZSk6CisgICAgICAg ICogd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oldl YlNvY2tldENoYW5uZWw6OldlYlNvY2tldENoYW5uZWwpOgorICAgICAgICAoV2ViQ29yZTo6V2Vi U29ja2V0Q2hhbm5lbDo6ZGlzY29ubmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpXZWJTb2NrZXRD aGFubmVsOjpkaWRPcGVuKToKKyAgICAgICAgKFdlYkNvcmU6OldlYlNvY2tldENoYW5uZWw6OmRp ZENsb3NlKToKKyAgICAgICAgKFdlYkNvcmU6OldlYlNvY2tldENoYW5uZWw6OnByb2Nlc3NCdWZm ZXIpOgorICAgICAgICAqIHdlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5oOgorCiAyMDEwLTA3 LTA1ICBZdXpvIEZ1amlzaGltYSAgPHl1em9AZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBEYW4gQmVybnN0ZWluLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yQ29udHJvbGxlci5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVy LmNwcAppbmRleCAwYzEwMTNjOTEzOGNiODM4MTgyNzMxNDcwZjgwNDM4NTU5YzAwMWJjLi5kNDE3 YTZhN2I3OTIzODNjYTA2NThhODU3MzhjODY4ZmIwNzQyNTM2IDEwMDY0NAotLS0gYS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcApAQCAtODA1LDggKzgwNSw2IEBAIHZvaWQgSW5zcGVj dG9yQ29udHJvbGxlcjo6YWRkUmVzb3VyY2UoSW5zcGVjdG9yUmVzb3VyY2UqIHJlc291cmNlKQog ICAgIG1fa25vd25SZXNvdXJjZXMuYWRkKHJlc291cmNlLT5yZXF1ZXN0VVJMKCkpOwogCiAgICAg RnJhbWUqIGZyYW1lID0gcmVzb3VyY2UtPmZyYW1lKCk7Ci0gICAgaWYgKCFmcmFtZSkKLSAgICAg ICAgcmV0dXJuOwogICAgIFJlc291cmNlc01hcCogcmVzb3VyY2VNYXAgPSBtX2ZyYW1lUmVzb3Vy Y2VzLmdldChmcmFtZSk7CiAgICAgaWYgKHJlc291cmNlTWFwKQogICAgICAgICByZXNvdXJjZU1h cC0+c2V0KHJlc291cmNlLT5pZGVudGlmaWVyKCksIHJlc291cmNlKTsKQEAgLTgyNSw4ICs4MjMs NiBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnJlbW92ZVJlc291cmNlKEluc3BlY3RvclJl c291cmNlKiByZXNvdXJjZSkKICAgICAgICAgbV9rbm93blJlc291cmNlcy5yZW1vdmUocmVxdWVz dFVSTCk7CiAKICAgICBGcmFtZSogZnJhbWUgPSByZXNvdXJjZS0+ZnJhbWUoKTsKLSAgICBpZiAo IWZyYW1lKQotICAgICAgICByZXR1cm47CiAgICAgUmVzb3VyY2VzTWFwKiByZXNvdXJjZU1hcCA9 IG1fZnJhbWVSZXNvdXJjZXMuZ2V0KGZyYW1lKTsKICAgICBpZiAoIXJlc291cmNlTWFwKSB7CiAg ICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwpAQCAtMTQ3MCw1NiArMTQ2Niw2IEBAIEluc3Bl Y3RvckRPTVN0b3JhZ2VSZXNvdXJjZSogSW5zcGVjdG9yQ29udHJvbGxlcjo6Z2V0RE9NU3RvcmFn ZVJlc291cmNlRm9ySWQobG9uCiB9CiAjZW5kaWYKIAotI2lmIEVOQUJMRShXRUJfU09DS0VUUykK LXZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkQ3JlYXRlV2ViU29ja2V0KHVuc2lnbmVkIGxv bmcgaWRlbnRpZmllciwgY29uc3QgS1VSTCYgcmVxdWVzdFVSTCwgY29uc3QgS1VSTCYgZG9jdW1l bnRVUkwpCi17Ci0gICAgaWYgKCFlbmFibGVkKCkpCi0gICAgICAgIHJldHVybjsKLSAgICBBU1NF UlQobV9pbnNwZWN0ZWRQYWdlKTsKLQotICAgIFJlZlB0cjxJbnNwZWN0b3JSZXNvdXJjZT4gcmVz b3VyY2UgPSBJbnNwZWN0b3JSZXNvdXJjZTo6Y3JlYXRlV2ViU29ja2V0KGlkZW50aWZpZXIsIHJl cXVlc3RVUkwsIGRvY3VtZW50VVJMKTsKLSAgICBhZGRSZXNvdXJjZShyZXNvdXJjZS5nZXQoKSk7 Ci0KLSAgICBpZiAobV9mcm9udGVuZCkKLSAgICAgICAgcmVzb3VyY2UtPnVwZGF0ZVNjcmlwdE9i amVjdChtX2Zyb250ZW5kLmdldCgpKTsKLX0KLQotdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjp3 aWxsU2VuZFdlYlNvY2tldEhhbmRzaGFrZVJlcXVlc3QodW5zaWduZWQgbG9uZyBpZGVudGlmaWVy LCBjb25zdCBXZWJTb2NrZXRIYW5kc2hha2VSZXF1ZXN0JiByZXF1ZXN0KQotewotICAgIFJlZlB0 cjxJbnNwZWN0b3JSZXNvdXJjZT4gcmVzb3VyY2UgPSBnZXRUcmFja2VkUmVzb3VyY2UoaWRlbnRp Zmllcik7Ci0gICAgaWYgKCFyZXNvdXJjZSkKLSAgICAgICAgcmV0dXJuOwotICAgIHJlc291cmNl LT5zdGFydFRpbWluZygpOwotICAgIHJlc291cmNlLT51cGRhdGVXZWJTb2NrZXRSZXF1ZXN0KHJl cXVlc3QpOwotICAgIGlmIChtX2Zyb250ZW5kKQotICAgICAgICByZXNvdXJjZS0+dXBkYXRlU2Ny aXB0T2JqZWN0KG1fZnJvbnRlbmQuZ2V0KCkpOwotfQotCi12b2lkIEluc3BlY3RvckNvbnRyb2xs ZXI6OmRpZFJlY2VpdmVXZWJTb2NrZXRIYW5kc2hha2VSZXNwb25zZSh1bnNpZ25lZCBsb25nIGlk ZW50aWZpZXIsIGNvbnN0IFdlYlNvY2tldEhhbmRzaGFrZVJlc3BvbnNlJiByZXNwb25zZSkKLXsK LSAgICBSZWZQdHI8SW5zcGVjdG9yUmVzb3VyY2U+IHJlc291cmNlID0gZ2V0VHJhY2tlZFJlc291 cmNlKGlkZW50aWZpZXIpOwotICAgIGlmICghcmVzb3VyY2UpCi0gICAgICAgIHJldHVybjsKLSAg ICAvLyBDYWxsaW5nIHJlc291cmNlLT5tYXJrUmVzcG9uc2VSZWNlaXZlZFRpbWUoKSBoZXJlIG1h a2VzIHJlc291cmNlcyBiYXIgY2hhcnQgY29uZnVzaW5nLCBiZWNhdXNlCi0gICAgLy8gd2UgY2Fu bm90IGFwcGx5IHRoZSAibGF0ZW5jeSArIGRvd25sb2FkIiBtb2RlbCBvZiByZWd1bGFyIHJlc291 cmNlcyB0byBXZWJTb2NrZXQgY29ubmVjdGlvbnMuCi0gICAgLy8gRklYTUU6IERlc2lnbiBhIG5l dyBVSSBmb3IgYmFyIGNoYXJ0cyBvZiBXZWJTb2NrZXQgcmVzb3VyY2VzLCBhbmQgcmVjb3JkIHRp bWluZyBoZXJlLgotICAgIHJlc291cmNlLT51cGRhdGVXZWJTb2NrZXRSZXNwb25zZShyZXNwb25z ZSk7Ci0gICAgaWYgKG1fZnJvbnRlbmQpCi0gICAgICAgIHJlc291cmNlLT51cGRhdGVTY3JpcHRP YmplY3QobV9mcm9udGVuZC5nZXQoKSk7Ci19Ci0KLXZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6 ZGlkQ2xvc2VXZWJTb2NrZXQodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKQotewotICAgIFJlZlB0 cjxJbnNwZWN0b3JSZXNvdXJjZT4gcmVzb3VyY2UgPSBnZXRUcmFja2VkUmVzb3VyY2UoaWRlbnRp Zmllcik7Ci0gICAgaWYgKCFyZXNvdXJjZSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgcmVzb3Vy Y2UtPmVuZFRpbWluZygpOwotICAgIGlmIChtX2Zyb250ZW5kKQotICAgICAgICByZXNvdXJjZS0+ dXBkYXRlU2NyaXB0T2JqZWN0KG1fZnJvbnRlbmQuZ2V0KCkpOwotfQotI2VuZGlmIC8vIEVOQUJM RShXRUJfU09DS0VUUykKLQogI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQogdm9pZCBJ bnNwZWN0b3JDb250cm9sbGVyOjphZGRQcm9maWxlKFBhc3NSZWZQdHI8U2NyaXB0UHJvZmlsZT4g cHJwUHJvZmlsZSwgdW5zaWduZWQgbGluZU51bWJlciwgY29uc3QgU3RyaW5nJiBzb3VyY2VVUkwp CiB7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgg Yi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKaW5kZXggNjE2NTk4OTgx YzYzMzg4NjVjMWVhYzYwNGJlNTg1NmNlNWU1ZWRjMC4uM2NjM2UzZWM2NDZiYzUyNjViODg4YTQ3 NjQ4NDEyZGZlZjAwMTU2OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y Q29udHJvbGxlci5oCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIu aApAQCAtOTAsMTEgKzkwLDYgQEAgY2xhc3MgU3RvcmFnZUFyZWE7CiBjbGFzcyBJbnNwZWN0b3JB cHBsaWNhdGlvbkNhY2hlQWdlbnQ7CiAjZW5kaWYKIAotI2lmIEVOQUJMRShXRUJfU09DS0VUUykK LWNsYXNzIFdlYlNvY2tldEhhbmRzaGFrZVJlcXVlc3Q7Ci1jbGFzcyBXZWJTb2NrZXRIYW5kc2hh a2VSZXNwb25zZTsKLSNlbmRpZgotCiBjbGFzcyBJbnNwZWN0b3JDb250cm9sbGVyCiAjaWYgRU5B QkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCiAgICAgICAgICAgICAgICAgICAgICAgICAgIDogU2Ny aXB0RGVidWdMaXN0ZW5lciwgcHVibGljIE5vbmNvcHlhYmxlCkBAIC0yMjAsMTIgKzIxNSw2IEBA IHB1YmxpYzoKICAgICB2b2lkIHNldERPTVN0b3JhZ2VJdGVtKGxvbmcgY2FsbElkLCBsb25nIHN0 b3JhZ2VJZCwgY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgdmFsdWUpOwogICAgIHZv aWQgcmVtb3ZlRE9NU3RvcmFnZUl0ZW0obG9uZyBjYWxsSWQsIGxvbmcgc3RvcmFnZUlkLCBjb25z dCBTdHJpbmcmIGtleSk7CiAjZW5kaWYKLSNpZiBFTkFCTEUoV0VCX1NPQ0tFVFMpCi0gICAgdm9p ZCBkaWRDcmVhdGVXZWJTb2NrZXQodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBLVVJM JiByZXF1ZXN0VVJMLCBjb25zdCBLVVJMJiBkb2N1bWVudFVSTCk7Ci0gICAgdm9pZCB3aWxsU2Vu ZFdlYlNvY2tldEhhbmRzaGFrZVJlcXVlc3QodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25z dCBXZWJTb2NrZXRIYW5kc2hha2VSZXF1ZXN0Jik7Ci0gICAgdm9pZCBkaWRSZWNlaXZlV2ViU29j a2V0SGFuZHNoYWtlUmVzcG9uc2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBXZWJT b2NrZXRIYW5kc2hha2VSZXNwb25zZSYpOwotICAgIHZvaWQgZGlkQ2xvc2VXZWJTb2NrZXQodW5z aWduZWQgbG9uZyBpZGVudGlmaWVyKTsKLSNlbmRpZgogCiAgICAgY29uc3QgUmVzb3VyY2VzTWFw JiByZXNvdXJjZXMoKSBjb25zdCB7IHJldHVybiBtX3Jlc291cmNlczsgfQogICAgIEluc3BlY3Rv clJlc291cmNlKiByZXNvdXJjZUZvclVSTChjb25zdCBTdHJpbmcmIHVybCk7CmRpZmYgLS1naXQg YS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5jcHAgYi9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5jcHAKaW5kZXggNTE1N2E1MzdkZTBkYmI4YWI0YWYyZTJi NTk1OTIxYzhlOWYxZTA4Ny4uZjBlMzkxZGU5NjI2ZTg2MGMxN2I1NGVlY2RmZjJlZmMzN2RiNjlk NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2UuY3BwCisr KyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlLmNwcApAQCAtNDEsNDAgKzQx LDE2IEBACiAjaW5jbHVkZSAiSW5zcGVjdG9yRnJvbnRlbmQuaCIKICNpbmNsdWRlICJSZXNvdXJj ZVJlcXVlc3QuaCIKICNpbmNsdWRlICJSZXNvdXJjZVJlc3BvbnNlLmgiCi0jaW5jbHVkZSAiU3Ry aW5nQnVmZmVyLmgiCiAjaW5jbHVkZSAiVGV4dEVuY29kaW5nLmgiCiAjaW5jbHVkZSAiU2NyaXB0 T2JqZWN0LmgiCi0jaW5jbHVkZSAiV2ViU29ja2V0SGFuZHNoYWtlUmVxdWVzdC5oIgotI2luY2x1 ZGUgIldlYlNvY2tldEhhbmRzaGFrZVJlc3BvbnNlLmgiCi0KLSNpbmNsdWRlIDx3dGYvQXNzZXJ0 aW9ucy5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLS8vIENyZWF0ZSBodW1hbi1yZWFkYWJs ZSBiaW5hcnkgcmVwcmVzZW50YXRpb24sIGxpa2UgIjAxOjIzOjQ1OjY3Ojg5OkFCOkNEOkVGIi4K LXN0YXRpYyBTdHJpbmcgY3JlYXRlUmVhZGFibGVTdHJpbmdGcm9tQmluYXJ5KGNvbnN0IHVuc2ln bmVkIGNoYXIqIHZhbHVlLCBzaXplX3QgbGVuZ3RoKQotewotICAgIEFTU0VSVChsZW5ndGggPiAw KTsKLSAgICBzdGF0aWMgY29uc3QgY2hhciBoZXhEaWdpdHNbMTddID0gIjAxMjM0NTY3ODlBQkNE RUYiOwotICAgIHNpemVfdCBidWZmZXJTaXplID0gbGVuZ3RoICogMyAtIDE7Ci0gICAgU3RyaW5n QnVmZmVyIGJ1ZmZlcihidWZmZXJTaXplKTsKLSAgICBzaXplX3QgaW5kZXggPSAwOwotICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgbGVuZ3RoOyArK2kpIHsKLSAgICAgICAgaWYgKGkgPiAwKQot ICAgICAgICAgICAgYnVmZmVyW2luZGV4KytdID0gJzonOwotICAgICAgICBidWZmZXJbaW5kZXgr K10gPSBoZXhEaWdpdHNbdmFsdWVbaV0gPj4gNF07Ci0gICAgICAgIGJ1ZmZlcltpbmRleCsrXSA9 IGhleERpZ2l0c1t2YWx1ZVtpXSAmIDB4Rl07Ci0gICAgfQotICAgIEFTU0VSVChpbmRleCA9PSBi dWZmZXJTaXplKTsKLSAgICByZXR1cm4gU3RyaW5nOjphZG9wdChidWZmZXIpOwotfQotCi1JbnNw ZWN0b3JSZXNvdXJjZTo6SW5zcGVjdG9yUmVzb3VyY2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVy LCBEb2N1bWVudExvYWRlciogbG9hZGVyLCBjb25zdCBLVVJMJiByZXF1ZXN0VVJMLCBjb25zdCBL VVJMJiBkb2N1bWVudFVSTCkKK0luc3BlY3RvclJlc291cmNlOjpJbnNwZWN0b3JSZXNvdXJjZSh1 bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIGNvbnN0IEtV UkwmIHJlcXVlc3RVUkwpCiAgICAgOiBtX2lkZW50aWZpZXIoaWRlbnRpZmllcikKICAgICAsIG1f bG9hZGVyKGxvYWRlcikKLSAgICAsIG1fZnJhbWUobG9hZGVyID8gbG9hZGVyLT5mcmFtZSgpIDog MCkKKyAgICAsIG1fZnJhbWUobG9hZGVyLT5mcmFtZSgpKQogICAgICwgbV9yZXF1ZXN0VVJMKHJl cXVlc3RVUkwpCi0gICAgLCBtX2RvY3VtZW50VVJMKGRvY3VtZW50VVJMKQogICAgICwgbV9leHBl Y3RlZENvbnRlbnRMZW5ndGgoMCkKICAgICAsIG1fY2FjaGVkKGZhbHNlKQogICAgICwgbV9maW5p c2hlZChmYWxzZSkKQEAgLTg3LDkgKzYzLDYgQEAgSW5zcGVjdG9yUmVzb3VyY2U6Okluc3BlY3Rv clJlc291cmNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRG9jdW1lbnRMb2FkZXIqIGwKICAg ICAsIG1fbG9hZEV2ZW50VGltZSgtMS4wKQogICAgICwgbV9kb21Db250ZW50RXZlbnRUaW1lKC0x LjApCiAgICAgLCBtX2lzTWFpblJlc291cmNlKGZhbHNlKQotI2lmIEVOQUJMRShXRUJfU09DS0VU UykKLSAgICAsIG1faXNXZWJTb2NrZXQoZmFsc2UpCi0jZW5kaWYKIHsKIH0KIApAQCAtMTEyLDEy ICs4NSw2IEBAIFBhc3NSZWZQdHI8SW5zcGVjdG9yUmVzb3VyY2U+IEluc3BlY3RvclJlc291cmNl OjphcHBlbmRSZWRpcmVjdCh1bnNpZ25lZCBsb25nIGlkCiAgICAgcmV0dXJuIHJlZGlyZWN0Owog fQogCi1QYXNzUmVmUHRyPEluc3BlY3RvclJlc291cmNlPiBJbnNwZWN0b3JSZXNvdXJjZTo6Y3Jl YXRlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRG9jdW1lbnRMb2FkZXIqIGxvYWRlciwgY29u c3QgS1VSTCYgcmVxdWVzdFVSTCkKLXsKLSAgICBBU1NFUlQobG9hZGVyKTsKLSAgICByZXR1cm4g YWRvcHRSZWYobmV3IEluc3BlY3RvclJlc291cmNlKGlkZW50aWZpZXIsIGxvYWRlciwgcmVxdWVz dFVSTCwgbG9hZGVyLT5mcmFtZSgpLT5kb2N1bWVudCgpLT51cmwoKSkpOwotfQotCiBQYXNzUmVm UHRyPEluc3BlY3RvclJlc291cmNlPiBJbnNwZWN0b3JSZXNvdXJjZTo6Y3JlYXRlQ2FjaGVkKHVu c2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRG9jdW1lbnRMb2FkZXIqIGxvYWRlciwgY29uc3QgQ2Fj aGVkUmVzb3VyY2UqIGNhY2hlZFJlc291cmNlKQogewogICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9y UmVzb3VyY2U+IHJlc291cmNlID0gY3JlYXRlKGlkZW50aWZpZXIsIGxvYWRlciwgS1VSTChQYXJz ZWRVUkxTdHJpbmcsIGNhY2hlZFJlc291cmNlLT51cmwoKSkpOwpAQCAtMTM3LDE1ICsxMDQsNiBA QCBQYXNzUmVmUHRyPEluc3BlY3RvclJlc291cmNlPiBJbnNwZWN0b3JSZXNvdXJjZTo6Y3JlYXRl Q2FjaGVkKHVuc2lnbmVkIGxvbmcgaWRlbgogICAgIHJldHVybiByZXNvdXJjZTsKIH0KIAotI2lm IEVOQUJMRShXRUJfU09DS0VUUykKLVBhc3NSZWZQdHI8SW5zcGVjdG9yUmVzb3VyY2U+IEluc3Bl Y3RvclJlc291cmNlOjpjcmVhdGVXZWJTb2NrZXQodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBj b25zdCBLVVJMJiByZXF1ZXN0VVJMLCBjb25zdCBLVVJMJiBkb2N1bWVudFVSTCkKLXsKLSAgICBS ZWZQdHI8SW5zcGVjdG9yUmVzb3VyY2U+IHJlc291cmNlKG5ldyBJbnNwZWN0b3JSZXNvdXJjZShp ZGVudGlmaWVyLCAwLCByZXF1ZXN0VVJMLCBkb2N1bWVudFVSTCkpOwotICAgIHJlc291cmNlLT5t YXJrV2ViU29ja2V0KCk7Ci0gICAgcmV0dXJuIHJlc291cmNlLnJlbGVhc2UoKTsKLX0KLSNlbmRp ZgotCiB2b2lkIEluc3BlY3RvclJlc291cmNlOjp1cGRhdGVSZXF1ZXN0KGNvbnN0IFJlc291cmNl UmVxdWVzdCYgcmVxdWVzdCkKIHsKICAgICBtX3JlcXVlc3RIZWFkZXJGaWVsZHMgPSByZXF1ZXN0 Lmh0dHBIZWFkZXJGaWVsZHMoKTsKQEAgLTE3NCwyNyArMTMyLDYgQEAgdm9pZCBJbnNwZWN0b3JS ZXNvdXJjZTo6dXBkYXRlUmVzcG9uc2UoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2Up CiAgICAgbV9jaGFuZ2VzLnNldChUeXBlQ2hhbmdlKTsKIH0KIAotI2lmIEVOQUJMRShXRUJfU09D S0VUUykKLXZvaWQgSW5zcGVjdG9yUmVzb3VyY2U6OnVwZGF0ZVdlYlNvY2tldFJlcXVlc3QoY29u c3QgV2ViU29ja2V0SGFuZHNoYWtlUmVxdWVzdCYgcmVxdWVzdCkKLXsKLSAgICBtX3JlcXVlc3RI ZWFkZXJGaWVsZHMgPSByZXF1ZXN0LmhlYWRlckZpZWxkcygpOwotICAgIG1fcmVxdWVzdE1ldGhv ZCA9ICJHRVQiOyAvLyBDdXJyZW50bHkgd2UgYWx3YXlzIHVzZSAiR0VUIiB0byByZXF1ZXN0IGhh bmRzaGFrZS4KLSAgICBtX3dlYlNvY2tldFJlcXVlc3RLZXkzLnNldChuZXcgV2ViU29ja2V0SGFu ZHNoYWtlUmVxdWVzdDo6S2V5MyhyZXF1ZXN0LmtleTMoKSkpOwotICAgIG1fY2hhbmdlcy5zZXQo UmVxdWVzdENoYW5nZSk7Ci0gICAgbV9jaGFuZ2VzLnNldChUeXBlQ2hhbmdlKTsKLX0KLQotdm9p ZCBJbnNwZWN0b3JSZXNvdXJjZTo6dXBkYXRlV2ViU29ja2V0UmVzcG9uc2UoY29uc3QgV2ViU29j a2V0SGFuZHNoYWtlUmVzcG9uc2UmIHJlc3BvbnNlKQotewotICAgIG1fcmVzcG9uc2VTdGF0dXND b2RlID0gcmVzcG9uc2Uuc3RhdHVzQ29kZSgpOwotICAgIG1fcmVzcG9uc2VTdGF0dXNUZXh0ID0g cmVzcG9uc2Uuc3RhdHVzVGV4dCgpOwotICAgIG1fcmVzcG9uc2VIZWFkZXJGaWVsZHMgPSByZXNw b25zZS5oZWFkZXJGaWVsZHMoKTsKLSAgICBtX3dlYlNvY2tldENoYWxsZW5nZVJlc3BvbnNlLnNl dChuZXcgV2ViU29ja2V0SGFuZHNoYWtlUmVzcG9uc2U6OkNoYWxsZW5nZVJlc3BvbnNlKHJlc3Bv bnNlLmNoYWxsZW5nZVJlc3BvbnNlKCkpKTsKLSAgICBtX2NoYW5nZXMuc2V0KFJlc3BvbnNlQ2hh bmdlKTsKLSAgICBtX2NoYW5nZXMuc2V0KFR5cGVDaGFuZ2UpOwotfQotI2VuZGlmIC8vIEVOQUJM RShXRUJfU09DS0VUUykKLQogc3RhdGljIHZvaWQgcG9wdWxhdGVIZWFkZXJzT2JqZWN0KFNjcmlw dE9iamVjdCogb2JqZWN0LCBjb25zdCBIVFRQSGVhZGVyTWFwJiBoZWFkZXJzKQogewogICAgIEhU VFBIZWFkZXJNYXA6OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IGhlYWRlcnMuZW5kKCk7CkBAIC0yMTIs NyArMTQ5LDcgQEAgdm9pZCBJbnNwZWN0b3JSZXNvdXJjZTo6dXBkYXRlU2NyaXB0T2JqZWN0KElu c3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCkKICAgICBTY3JpcHRPYmplY3QganNvbk9iamVjdCA9 IGZyb250ZW5kLT5uZXdTY3JpcHRPYmplY3QoKTsKICAgICBpZiAobV9jaGFuZ2VzLmhhc0NoYW5n ZShSZXF1ZXN0Q2hhbmdlKSkgewogICAgICAgICBqc29uT2JqZWN0LnNldCgidXJsIiwgbV9yZXF1 ZXN0VVJMLnN0cmluZygpKTsKLSAgICAgICAganNvbk9iamVjdC5zZXQoImRvY3VtZW50VVJMIiwg bV9kb2N1bWVudFVSTC5zdHJpbmcoKSk7CisgICAgICAgIGpzb25PYmplY3Quc2V0KCJkb2N1bWVu dFVSTCIsIG1fZnJhbWUtPmRvY3VtZW50KCktPnVybCgpLnN0cmluZygpKTsKICAgICAgICAganNv bk9iamVjdC5zZXQoImhvc3QiLCBtX3JlcXVlc3RVUkwuaG9zdCgpKTsKICAgICAgICAganNvbk9i amVjdC5zZXQoInBhdGgiLCBtX3JlcXVlc3RVUkwucGF0aCgpKTsKICAgICAgICAganNvbk9iamVj dC5zZXQoImxhc3RQYXRoQ29tcG9uZW50IiwgbV9yZXF1ZXN0VVJMLmxhc3RQYXRoQ29tcG9uZW50 KCkpOwpAQCAtMjI0LDEwICsxNjEsNiBAQCB2b2lkIEluc3BlY3RvclJlc291cmNlOjp1cGRhdGVT Y3JpcHRPYmplY3QoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kKQogICAgICAgICBqc29uT2Jq ZWN0LnNldCgicmVxdWVzdEZvcm1EYXRhIiwgbV9yZXF1ZXN0Rm9ybURhdGEpOwogICAgICAgICBq c29uT2JqZWN0LnNldCgiZGlkUmVxdWVzdENoYW5nZSIsIHRydWUpOwogICAgICAgICBqc29uT2Jq ZWN0LnNldCgiY2FjaGVkIiwgbV9jYWNoZWQpOwotI2lmIEVOQUJMRShXRUJfU09DS0VUUykKLSAg ICAgICAgaWYgKG1fd2ViU29ja2V0UmVxdWVzdEtleTMpCi0gICAgICAgICAgICBqc29uT2JqZWN0 LnNldCgid2ViU29ja2V0UmVxdWVzdEtleTMiLCBjcmVhdGVSZWFkYWJsZVN0cmluZ0Zyb21CaW5h cnkobV93ZWJTb2NrZXRSZXF1ZXN0S2V5My0+dmFsdWUsIHNpemVvZihtX3dlYlNvY2tldFJlcXVl c3RLZXkzLT52YWx1ZSkpKTsKLSNlbmRpZgogICAgIH0KIAogICAgIGlmIChtX2NoYW5nZXMuaGFz Q2hhbmdlKFJlc3BvbnNlQ2hhbmdlKSkgewpAQCAtMjM5LDEwICsxNzIsNiBAQCB2b2lkIEluc3Bl Y3RvclJlc291cmNlOjp1cGRhdGVTY3JpcHRPYmplY3QoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250 ZW5kKQogICAgICAgICBTY3JpcHRPYmplY3QgcmVzcG9uc2VIZWFkZXJzID0gZnJvbnRlbmQtPm5l d1NjcmlwdE9iamVjdCgpOwogICAgICAgICBwb3B1bGF0ZUhlYWRlcnNPYmplY3QoJnJlc3BvbnNl SGVhZGVycywgbV9yZXNwb25zZUhlYWRlckZpZWxkcyk7CiAgICAgICAgIGpzb25PYmplY3Quc2V0 KCJyZXNwb25zZUhlYWRlcnMiLCByZXNwb25zZUhlYWRlcnMpOwotI2lmIEVOQUJMRShXRUJfU09D S0VUUykKLSAgICAgICAgaWYgKG1fd2ViU29ja2V0Q2hhbGxlbmdlUmVzcG9uc2UpCi0gICAgICAg ICAgICBqc29uT2JqZWN0LnNldCgid2ViU29ja2V0Q2hhbGxlbmdlUmVzcG9uc2UiLCBjcmVhdGVS ZWFkYWJsZVN0cmluZ0Zyb21CaW5hcnkobV93ZWJTb2NrZXRDaGFsbGVuZ2VSZXNwb25zZS0+dmFs dWUsIHNpemVvZihtX3dlYlNvY2tldENoYWxsZW5nZVJlc3BvbnNlLT52YWx1ZSkpKTsKLSNlbmRp ZgogICAgICAgICBqc29uT2JqZWN0LnNldCgiZGlkUmVzcG9uc2VDaGFuZ2UiLCB0cnVlKTsKICAg ICB9CiAKQEAgLTMwMSw4ICsyMzAsNiBAQCBDYWNoZWRSZXNvdXJjZSogSW5zcGVjdG9yUmVzb3Vy Y2U6OmNhY2hlZFJlc291cmNlKCkgY29uc3QKICAgICAvLyBUcnkgaGFyZCB0byBmaW5kIGEgY29y cmVzcG9uZGluZyBDYWNoZWRSZXNvdXJjZS4gRHVyaW5nIHByZWxvYWRpbmcsIERvY0xvYWRlciBt YXkgbm90IGhhdmUgdGhlIHJlc291cmNlIGluIGRvY3VtZW50IHJlc291cmNlcyBzZXQgeWV0LAog ICAgIC8vIGJ1dCBJbnNwZWN0b3Igd2lsbCBhbHJlYWR5IHRyeSB0byBmZXRjaCBkYXRhIHRoYXQg aXMgb25seSBhdmFpbGFibGUgdmlhIENhY2hlZFJlc291cmNlIChhbmQgaXQgd29uJ3QgdXBkYXRl IG9uY2UgdGhlIHJlc291cmNlIGlzIGFkZGVkLAogICAgIC8vIGJlY2F1c2UgbV9jaGFuZ2VzIHdp bGwgbm90IGhhdmUgdGhlIGFwcHJvcHJpYXRlIGJpdHMgc2V0KS4KLSAgICBpZiAoIW1fZnJhbWUp Ci0gICAgICAgIHJldHVybiAwOwogICAgIGNvbnN0IFN0cmluZyYgdXJsID0gbV9yZXF1ZXN0VVJM LnN0cmluZygpOwogICAgIENhY2hlZFJlc291cmNlKiBjYWNoZWRSZXNvdXJjZSA9IG1fZnJhbWUt PmRvY3VtZW50KCktPmRvY0xvYWRlcigpLT5jYWNoZWRSZXNvdXJjZSh1cmwpOwogICAgIGlmICgh Y2FjaGVkUmVzb3VyY2UpCkBAIC0zMzksMTIgKzI2Niw2IEBAIEluc3BlY3RvclJlc291cmNlOjpU eXBlIEluc3BlY3RvclJlc291cmNlOjp0eXBlKCkgY29uc3QKICAgICBpZiAoIW1fb3ZlcnJpZGVD b250ZW50LmlzTnVsbCgpKQogICAgICAgICByZXR1cm4gbV9vdmVycmlkZUNvbnRlbnRUeXBlOwog Ci0jaWYgRU5BQkxFKFdFQl9TT0NLRVRTKQotICAgIGlmIChtX2lzV2ViU29ja2V0KQotICAgICAg ICByZXR1cm4gV2ViU29ja2V0OwotI2VuZGlmCi0KLSAgICBBU1NFUlQobV9sb2FkZXIpOwogICAg IGlmIChtX3JlcXVlc3RVUkwgPT0gbV9sb2FkZXItPnJlcXVlc3RVUkwoKSkgewogICAgICAgICBJ bnNwZWN0b3JSZXNvdXJjZTo6VHlwZSByZXNvdXJjZVR5cGUgPSBjYWNoZWRSZXNvdXJjZVR5cGUo KTsKICAgICAgICAgaWYgKHJlc291cmNlVHlwZSA9PSBPdGhlcikKQEAgLTM4NCw3ICszMDUsNyBA QCBTdHJpbmcgSW5zcGVjdG9yUmVzb3VyY2U6OnNvdXJjZVN0cmluZygpIGNvbnN0CiAKIFBhc3NS ZWZQdHI8U2hhcmVkQnVmZmVyPiBJbnNwZWN0b3JSZXNvdXJjZTo6cmVzb3VyY2VEYXRhKFN0cmlu ZyogdGV4dEVuY29kaW5nTmFtZSkgY29uc3QKIHsKLSAgICBpZiAobV9sb2FkZXIgJiYgbV9yZXF1 ZXN0VVJMID09IG1fbG9hZGVyLT5yZXF1ZXN0VVJMKCkpIHsKKyAgICBpZiAobV9yZXF1ZXN0VVJM ID09IG1fbG9hZGVyLT5yZXF1ZXN0VVJMKCkpIHsKICAgICAgICAgKnRleHRFbmNvZGluZ05hbWUg PSBtX2ZyYW1lLT5kb2N1bWVudCgpLT5pbnB1dEVuY29kaW5nKCk7CiAgICAgICAgIHJldHVybiBt X2xvYWRlci0+bWFpblJlc291cmNlRGF0YSgpOwogICAgIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlLmggYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JSZXNvdXJjZS5oCmluZGV4IDI2MTEwZjJmYWJhNTAxZjY1YTliMDc5OTY1NGZjNWY0ZTJjZmUw NTQuLjliOTE4ODliMTlmN2UzYTQ2YTk2YTljMzU0NGQwNTM3NTM4Y2JmOWQgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlLmgKKysrIGIvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2UuaApAQCAtMzYsOCArMzYsNiBAQAogI2luY2x1ZGUgIlNj cmlwdE9iamVjdC5oIgogI2luY2x1ZGUgIlNjcmlwdFN0YXRlLmgiCiAjaW5jbHVkZSAiU2NyaXB0 U3RyaW5nLmgiCi0jaW5jbHVkZSAiV2ViU29ja2V0SGFuZHNoYWtlUmVxdWVzdC5oIgotI2luY2x1 ZGUgIldlYlNvY2tldEhhbmRzaGFrZVJlc3BvbnNlLmgiCiAKICNpbmNsdWRlIDx3dGYvQ3VycmVu dFRpbWUuaD4KICNpbmNsdWRlIDx3dGYvT3duUHRyLmg+CkBAIC01MiwxMiArNTAsOCBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAgICAgY2xhc3MgSW5zcGVjdG9yRnJvbnRlbmQ7CiAgICAgY2xhc3Mg RnJhbWU7CiAgICAgY2xhc3MgUmVzb3VyY2VSZXNwb25zZTsKLSAgICBjbGFzcyBSZXNvdXJjZVJl cXVlc3Q7CiAKLSNpZiBFTkFCTEUoV0VCX1NPQ0tFVFMpCi0gICAgY2xhc3MgV2ViU29ja2V0SGFu ZHNoYWtlUmVxdWVzdDsKLSAgICBjbGFzcyBXZWJTb2NrZXRIYW5kc2hha2VSZXNwb25zZTsKLSNl bmRpZgorICAgIGNsYXNzIFJlc291cmNlUmVxdWVzdDsKIAogICAgIGNsYXNzIEluc3BlY3RvclJl c291cmNlIDogcHVibGljIFJlZkNvdW50ZWQ8SW5zcGVjdG9yUmVzb3VyY2U+IHsKICAgICBwdWJs aWM6CkBAIC03MSwxOSArNjUsMTYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAg U2NyaXB0LAogICAgICAgICAgICAgWEhSLAogICAgICAgICAgICAgTWVkaWEsCi0gICAgICAgICAg ICBXZWJTb2NrZXQsCiAgICAgICAgICAgICBPdGhlcgogICAgICAgICB9OwogCi0gICAgICAgIHN0 YXRpYyBQYXNzUmVmUHRyPEluc3BlY3RvclJlc291cmNlPiBjcmVhdGUodW5zaWduZWQgbG9uZyBp ZGVudGlmaWVyLCBEb2N1bWVudExvYWRlciogbG9hZGVyLCBjb25zdCBLVVJMJiByZXF1ZXN0VVJM KTsKKyAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yUmVzb3VyY2U+IGNyZWF0ZSh1 bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIGNvbnN0IEtV UkwmIHJlcXVlc3RVUkwpCisgICAgICAgIHsKKyAgICAgICAgICAgIHJldHVybiBhZG9wdFJlZihu ZXcgSW5zcGVjdG9yUmVzb3VyY2UoaWRlbnRpZmllciwgbG9hZGVyLCByZXF1ZXN0VVJMKSk7Cisg ICAgICAgIH0KIAogICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JSZXNvdXJjZT4g Y3JlYXRlQ2FjaGVkKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRG9jdW1lbnRMb2FkZXIqLCBj b25zdCBDYWNoZWRSZXNvdXJjZSopOwogCi0jaWYgRU5BQkxFKFdFQl9TT0NLRVRTKQotICAgICAg ICAvLyBXZWJTb2NrZXQgcmVzb3VyY2UgZG9lc24ndCBoYXZlIGl0cyBsb2FkZXIuIEZvciBXZWJT b2NrZXQgcmVzb3VyY2VzLCBtX2xvYWRlciBhbmQgbV9mcmFtZSB3aWxsIGJlY29tZSBudWxsLgot ICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JSZXNvdXJjZT4gY3JlYXRlV2ViU29j a2V0KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgS1VSTCYgcmVxdWVzdFVSTCwgY29u c3QgS1VSTCYgZG9jdW1lbnRVUkwpOwotI2VuZGlmCi0KICAgICAgICAgfkluc3BlY3RvclJlc291 cmNlKCk7CiAKICAgICAgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3JSZXNvdXJjZT4gYXBwZW5kUmVk aXJlY3QodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBLVVJMJiByZWRpcmVjdFVSTCk7 CkBAIC05MywxMSArODQsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgdXBk YXRlUmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmKTsKICAgICAgICAgdm9pZCB1cGRhdGVS ZXNwb25zZShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJik7CiAKLSNpZiBFTkFCTEUoV0VCX1NPQ0tF VFMpCi0gICAgICAgIHZvaWQgdXBkYXRlV2ViU29ja2V0UmVxdWVzdChjb25zdCBXZWJTb2NrZXRI YW5kc2hha2VSZXF1ZXN0Jik7Ci0gICAgICAgIHZvaWQgdXBkYXRlV2ViU29ja2V0UmVzcG9uc2Uo Y29uc3QgV2ViU29ja2V0SGFuZHNoYWtlUmVzcG9uc2UmKTsKLSNlbmRpZgotCiAgICAgICAgIHZv aWQgc2V0T3ZlcnJpZGVDb250ZW50KGNvbnN0IFNjcmlwdFN0cmluZyYgZGF0YSwgVHlwZSk7CiAK ICAgICAgICAgU3RyaW5nIHNvdXJjZVN0cmluZygpIGNvbnN0OwpAQCAtMTYwLDIxICsxNDYsMTYg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgQ2hhbmdlVHlwZSBtX2NoYW5nZTsK ICAgICAgICAgfTsKIAotICAgICAgICBJbnNwZWN0b3JSZXNvdXJjZSh1bnNpZ25lZCBsb25nIGlk ZW50aWZpZXIsIERvY3VtZW50TG9hZGVyKiwgY29uc3QgS1VSTCYgcmVxdWVzdFVSTCwgY29uc3Qg S1VSTCYgZG9jdW1lbnRVUkwpOworICAgICAgICBJbnNwZWN0b3JSZXNvdXJjZSh1bnNpZ25lZCBs b25nIGlkZW50aWZpZXIsIERvY3VtZW50TG9hZGVyKiwgY29uc3QgS1VSTCYgcmVxdWVzdFVSTCk7 CiAgICAgICAgIFR5cGUgdHlwZSgpIGNvbnN0OwogCiAgICAgICAgIFR5cGUgY2FjaGVkUmVzb3Vy Y2VUeXBlKCkgY29uc3Q7CiAgICAgICAgIENhY2hlZFJlc291cmNlKiBjYWNoZWRSZXNvdXJjZSgp IGNvbnN0OwogCi0jaWYgRU5BQkxFKFdFQl9TT0NLRVRTKQotICAgICAgICB2b2lkIG1hcmtXZWJT b2NrZXQoKSB7IG1faXNXZWJTb2NrZXQgPSB0cnVlOyB9Ci0jZW5kaWYKLQogICAgICAgICB1bnNp Z25lZCBsb25nIG1faWRlbnRpZmllcjsKICAgICAgICAgUmVmUHRyPERvY3VtZW50TG9hZGVyPiBt X2xvYWRlcjsKICAgICAgICAgUmVmUHRyPEZyYW1lPiBtX2ZyYW1lOwogICAgICAgICBLVVJMIG1f cmVxdWVzdFVSTDsKLSAgICAgICAgS1VSTCBtX2RvY3VtZW50VVJMOwogICAgICAgICBIVFRQSGVh ZGVyTWFwIG1fcmVxdWVzdEhlYWRlckZpZWxkczsKICAgICAgICAgSFRUUEhlYWRlck1hcCBtX3Jl c3BvbnNlSGVhZGVyRmllbGRzOwogICAgICAgICBTdHJpbmcgbV9taW1lVHlwZTsKQEAgLTE5OCwx NSArMTc5LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBTdHJpbmcgbV9yZXF1ZXN0 TWV0aG9kOwogICAgICAgICBTdHJpbmcgbV9yZXF1ZXN0Rm9ybURhdGE7CiAgICAgICAgIFZlY3Rv cjxSZWZQdHI8SW5zcGVjdG9yUmVzb3VyY2U+ID4gbV9yZWRpcmVjdHM7Ci0KLSNpZiBFTkFCTEUo V0VCX1NPQ0tFVFMpCi0gICAgICAgIGJvb2wgbV9pc1dlYlNvY2tldDsKLQotICAgICAgICAvLyBU aGUgZm9sbG93aW5nIGZpZWxkcyBhcmUgbm90IHVzZWQgZm9yIHJlc291cmNlcyBvdGhlciB0aGFu IFdlYlNvY2tldC4KLSAgICAgICAgLy8gV2UgYWxsb2NhdGUgdGhlbSBkeW5hbWljYWxseSB0byBy ZWR1Y2UgbWVtb3J5IGNvbnN1bXB0aW9uIGZvciByZWd1bGFyIHJlc291cmNlcy4KLSAgICAgICAg T3duUHRyPFdlYlNvY2tldEhhbmRzaGFrZVJlcXVlc3Q6OktleTM+IG1fd2ViU29ja2V0UmVxdWVz dEtleTM7Ci0gICAgICAgIE93blB0cjxXZWJTb2NrZXRIYW5kc2hha2VSZXNwb25zZTo6Q2hhbGxl bmdlUmVzcG9uc2U+IG1fd2ViU29ja2V0Q2hhbGxlbmdlUmVzcG9uc2U7Ci0jZW5kaWYKICAgICB9 OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvUmVzb3VyY2UuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2UuanMKaW5kZXggZTY2YTMyMDZkNzA5ZTZhNjMxZmY4ZTcwYWZmNmZmMTc2ZWQ5YjY0Ni4u MmFlMjNhMGY5MzM1ODgzZTRmZjliNDFmODNjZjYyNmE3NWVjOTdkMCAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcwpAQCAtNDUsOCArNDUsNyBAQCBXZWJJbnNwZWN0b3Iu UmVzb3VyY2UuVHlwZSA9IHsKICAgICBTY3JpcHQ6ICAgICA0LAogICAgIFhIUjogICAgICAgIDUs CiAgICAgTWVkaWE6ICAgICAgNiwKLSAgICBXZWJTb2NrZXQ6ICA3LAotICAgIE90aGVyOiAgICAg IDgsCisgICAgT3RoZXI6ICAgICAgNywKIAogICAgIGlzVGV4dFR5cGU6IGZ1bmN0aW9uKHR5cGUp CiAgICAgewpAQCAtNjgsOCArNjcsNiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZSA9IHsK ICAgICAgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJzY3JpcHQiKTsK ICAgICAgICAgICAgIGNhc2UgdGhpcy5YSFI6CiAgICAgICAgICAgICAgICAgcmV0dXJuIFdlYklu c3BlY3Rvci5VSVN0cmluZygiWEhSIik7Ci0gICAgICAgICAgICBjYXNlIHRoaXMuV2ViU29ja2V0 OgotICAgICAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIldlYlNvY2tl dCIpOwogICAgICAgICAgICAgY2FzZSB0aGlzLk90aGVyOgogICAgICAgICAgICAgZGVmYXVsdDoK ICAgICAgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJvdGhlciIpOwpA QCAtMzU1LDkgKzM1Miw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLlhIUjoKICAgICAgICAg ICAgICAgICB0aGlzLmNhdGVnb3J5ID0gV2ViSW5zcGVjdG9yLnJlc291cmNlQ2F0ZWdvcmllcy54 aHI7CiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rv ci5SZXNvdXJjZS5UeXBlLldlYlNvY2tldDoKLSAgICAgICAgICAgICAgICB0aGlzLmNhdGVnb3J5 ID0gV2ViSW5zcGVjdG9yLnJlc291cmNlQ2F0ZWdvcmllcy53ZWJzb2NrZXQ7Ci0gICAgICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBl Lk90aGVyOgogICAgICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgICAgICB0aGlzLmNhdGVn b3J5ID0gV2ViSW5zcGVjdG9yLnJlc291cmNlQ2F0ZWdvcmllcy5vdGhlcjsKQEAgLTU3MCw4ICs1 NjQsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlID0gewogCiAgICAgICAgIGlm ICh0eXBlb2YgdGhpcy50eXBlID09PSAidW5kZWZpbmVkIgogICAgICAgICAgfHwgdGhpcy50eXBl ID09PSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZS5PdGhlcgotICAgICAgICAgfHwgdGhpcy50 eXBlID09PSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZS5YSFIKLSAgICAgICAgIHx8IHRoaXMu dHlwZSA9PT0gV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUuV2ViU29ja2V0KQorICAgICAgICAg fHwgdGhpcy50eXBlID09PSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZS5YSFIpCiAgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKIAogICAgICAgICBpZiAodGhpcy5taW1lVHlwZSBpbiBXZWJJbnNw ZWN0b3IuTUlNRVR5cGVzKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1Jlc291cmNlVmlldy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZp ZXcuanMKaW5kZXggNTE3ZTkxNjU0MTMxNzM2MTk0OGVjMzU4ZTIzYjE2ZTVkNTI4NTE4MS4uYmZk MTU3NmQyYzdiMWRjYTQwODE1ZmVmMWY4NTg4MmZiMTM2MDgyOCAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qcworKysgYi9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUmVzb3VyY2VWaWV3LmpzCkBAIC0yNzgsMTkgKzI3OCwxMyBAQCBXZWJJ bnNwZWN0b3IuUmVzb3VyY2VWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgIF9yZWZyZXNoUmVxdWVz dEhlYWRlcnM6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHZhciBhZGRpdGlvbmFsUm93ID0g bnVsbDsKLSAgICAgICAgaWYgKHR5cGVvZiB0aGlzLnJlc291cmNlLndlYlNvY2tldFJlcXVlc3RL ZXkzICE9PSAidW5kZWZpbmVkIikKLSAgICAgICAgICAgIGFkZGl0aW9uYWxSb3cgPSB7aGVhZGVy OiAiKEtleTMpIiwgdmFsdWU6IHRoaXMucmVzb3VyY2Uud2ViU29ja2V0UmVxdWVzdEtleTN9Owot ICAgICAgICB0aGlzLl9yZWZyZXNoSGVhZGVycyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlcXVl c3QgSGVhZGVycyIpLCB0aGlzLnJlc291cmNlLnNvcnRlZFJlcXVlc3RIZWFkZXJzLCBhZGRpdGlv bmFsUm93LCB0aGlzLnJlcXVlc3RIZWFkZXJzVHJlZUVsZW1lbnQpOworICAgICAgICB0aGlzLl9y ZWZyZXNoSGVhZGVycyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlcXVlc3QgSGVhZGVycyIpLCB0 aGlzLnJlc291cmNlLnNvcnRlZFJlcXVlc3RIZWFkZXJzLCB0aGlzLnJlcXVlc3RIZWFkZXJzVHJl ZUVsZW1lbnQpOwogICAgICAgICB0aGlzLl9yZWZyZXNoRm9ybURhdGEoKTsKICAgICB9LAogCiAg ICAgX3JlZnJlc2hSZXNwb25zZUhlYWRlcnM6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHZh ciBhZGRpdGlvbmFsUm93ID0gbnVsbDsKLSAgICAgICAgaWYgKHR5cGVvZiB0aGlzLnJlc291cmNl LndlYlNvY2tldENoYWxsZW5nZVJlc3BvbnNlICE9PSAidW5kZWZpbmVkIikKLSAgICAgICAgICAg IGFkZGl0aW9uYWxSb3cgPSB7aGVhZGVyOiAiKENoYWxsZW5nZSBSZXNwb25zZSkiLCB2YWx1ZTog dGhpcy5yZXNvdXJjZS53ZWJTb2NrZXRDaGFsbGVuZ2VSZXNwb25zZX07Ci0gICAgICAgIHRoaXMu X3JlZnJlc2hIZWFkZXJzKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVzcG9uc2UgSGVhZGVycyIp LCB0aGlzLnJlc291cmNlLnNvcnRlZFJlc3BvbnNlSGVhZGVycywgYWRkaXRpb25hbFJvdywgdGhp cy5yZXNwb25zZUhlYWRlcnNUcmVlRWxlbWVudCk7CisgICAgICAgIHRoaXMuX3JlZnJlc2hIZWFk ZXJzKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVzcG9uc2UgSGVhZGVycyIpLCB0aGlzLnJlc291 cmNlLnNvcnRlZFJlc3BvbnNlSGVhZGVycywgdGhpcy5yZXNwb25zZUhlYWRlcnNUcmVlRWxlbWVu dCk7CiAgICAgfSwKIAogICAgIF9yZWZyZXNoSFRUUEluZm9ybWF0aW9uOiBmdW5jdGlvbigpCkBA IC0zMjEsNyArMzE1LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5wcm90b3R5cGUgPSB7 CiAgICAgICAgIH0KICAgICB9LAogICAgIAotICAgIF9yZWZyZXNoSGVhZGVyczogZnVuY3Rpb24o dGl0bGUsIGhlYWRlcnMsIGFkZGl0aW9uYWxSb3csIGhlYWRlcnNUcmVlRWxlbWVudCkKKyAgICBf cmVmcmVzaEhlYWRlcnM6IGZ1bmN0aW9uKHRpdGxlLCBoZWFkZXJzLCBoZWFkZXJzVHJlZUVsZW1l bnQpCiAgICAgewogICAgICAgICBoZWFkZXJzVHJlZUVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsK IApAQCAtMzM4LDE1ICszMzIsNiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3LnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgIGhlYWRlclRyZWVFbGVtZW50LnNlbGVjdGFibGUgPSBmYWxzZTsK ICAgICAgICAgICAgIGhlYWRlcnNUcmVlRWxlbWVudC5hcHBlbmRDaGlsZChoZWFkZXJUcmVlRWxl bWVudCk7CiAgICAgICAgIH0KLQotICAgICAgICBpZiAoYWRkaXRpb25hbFJvdykgewotICAgICAg ICAgICAgdmFyIHRpdGxlID0gIjxkaXYgY2xhc3M9XCJoZWFkZXItbmFtZVwiPiIgKyBhZGRpdGlv bmFsUm93LmhlYWRlci5lc2NhcGVIVE1MKCkgKyAiOjwvZGl2PiI7Ci0gICAgICAgICAgICB0aXRs ZSArPSAiPGRpdiBjbGFzcz1cImhlYWRlci12YWx1ZSBzb3VyY2UtY29kZVwiPiIgKyBhZGRpdGlv bmFsUm93LnZhbHVlLmVzY2FwZUhUTUwoKSArICI8L2Rpdj4iCi0KLSAgICAgICAgICAgIHZhciBo ZWFkZXJUcmVlRWxlbWVudCA9IG5ldyBUcmVlRWxlbWVudCh0aXRsZSwgbnVsbCwgZmFsc2UpOwot ICAgICAgICAgICAgaGVhZGVyVHJlZUVsZW1lbnQuc2VsZWN0YWJsZSA9IGZhbHNlOwotICAgICAg ICAgICAgaGVhZGVyc1RyZWVFbGVtZW50LmFwcGVuZENoaWxkKGhlYWRlclRyZWVFbGVtZW50KTsK LSAgICAgICAgfQogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL2luc3BlY3Rvci5jc3MgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVj dG9yLmNzcwppbmRleCAxNWY4MzAyNjNkOTg2OTg4YTNlODI4OWU0Yjk5MmMxZWU2OWQzOGEyLi5k OGUyOWU4OWJhNTkwMWY4OTRkYjUyYWE2ZDMzNzRhZmRhYWE5NTM4IDEwMDY0NAotLS0gYS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcworKysgYi9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcwpAQCAtMjgwMyw4ICsyODAzLDcgQEAgYnV0dG9u LmVuYWJsZS10b2dnbGUtc3RhdHVzLWJhci1pdGVtLnRvZ2dsZWQtb24gLmdseXBoIHsKIH0KIAog LnJlc291cmNlcy1jYXRlZ29yeS1kb2N1bWVudHMsIC5yZXNvdXJjZXMtY2F0ZWdvcnktc3R5bGVz aGVldHMsIC5yZXNvdXJjZXMtY2F0ZWdvcnktaW1hZ2VzLAotLnJlc291cmNlcy1jYXRlZ29yeS1z Y3JpcHRzLCAucmVzb3VyY2VzLWNhdGVnb3J5LXhociwgLnJlc291cmNlcy1jYXRlZ29yeS1mb250 cywKLS5yZXNvdXJjZXMtY2F0ZWdvcnktd2Vic29ja2V0cywgLnJlc291cmNlcy1jYXRlZ29yeS1v dGhlciB7CisucmVzb3VyY2VzLWNhdGVnb3J5LXNjcmlwdHMsIC5yZXNvdXJjZXMtY2F0ZWdvcnkt eGhyLCAucmVzb3VyY2VzLWNhdGVnb3J5LWZvbnRzLCAucmVzb3VyY2VzLWNhdGVnb3J5LW90aGVy IHsKICAgICBkaXNwbGF5OiBub25lOwogfQogCkBAIC0yODE0LDcgKzI4MTMsNiBAQCBidXR0b24u ZW5hYmxlLXRvZ2dsZS1zdGF0dXMtYmFyLWl0ZW0udG9nZ2xlZC1vbiAuZ2x5cGggewogLmZpbHRl ci1hbGwgLnJlc291cmNlcy1jYXRlZ29yeS1zY3JpcHRzLCAuZmlsdGVyLXNjcmlwdHMgLnJlc291 cmNlcy1jYXRlZ29yeS1zY3JpcHRzLAogLmZpbHRlci1hbGwgLnJlc291cmNlcy1jYXRlZ29yeS14 aHIsIC5maWx0ZXIteGhyIC5yZXNvdXJjZXMtY2F0ZWdvcnkteGhyLAogLmZpbHRlci1hbGwgLnJl c291cmNlcy1jYXRlZ29yeS1mb250cywgLmZpbHRlci1mb250cyAucmVzb3VyY2VzLWNhdGVnb3J5 LWZvbnRzLAotLmZpbHRlci1hbGwgLnJlc291cmNlcy1jYXRlZ29yeS13ZWJzb2NrZXRzLCAuZmls dGVyLXdlYnNvY2tldHMgLnJlc291cmNlcy1jYXRlZ29yeS13ZWJzb2NrZXRzLAogLmZpbHRlci1h bGwgLnJlc291cmNlcy1jYXRlZ29yeS1vdGhlciwgLmZpbHRlci1vdGhlciAucmVzb3VyY2VzLWNh dGVnb3J5LW90aGVyLAogLnJlc291cmNlLXNpZGViYXItdHJlZS1pdGVtLnNlbGVjdGVkIHsKICAg ICBkaXNwbGF5OiBsaXN0LWl0ZW07CkBAIC0yODkwLDE1ICsyODg4LDYgQEAgYnV0dG9uLmVuYWJs ZS10b2dnbGUtc3RhdHVzLWJhci1pdGVtLnRvZ2dsZWQtb24gLmdseXBoIHsKICAgICAtd2Via2l0 LWJvcmRlci1pbWFnZTogdXJsKEltYWdlcy90aW1lbGluZUhvbGxvd1BpbGxZZWxsb3cucG5nKSA2 IDcgNiA3OwogfQogCi0vKiBGSVhNRTogQ3JlYXRlIGJhciBpbWFnZXMgZm9yIFdlYlNvY2tldC4g Ki8KLS5yZXNvdXJjZXMtY2F0ZWdvcnktd2Vic29ja2V0cyAucmVzb3VyY2VzLWdyYXBoLWJhciB7 Ci0gICAgLXdlYmtpdC1ib3JkZXItaW1hZ2U6IHVybChJbWFnZXMvdGltZWxpbmVQaWxsR3JheS5w bmcpIDYgNyA2IDc7Ci19Ci0KLS5yZXNvdXJjZXMtY2F0ZWdvcnktd2Vic29ja2V0cy5yZXNvdXJj ZS1jYWNoZWQgLnJlc291cmNlcy1ncmFwaC1iYXIgewotICAgLXdlYmtpdC1ib3JkZXItaW1hZ2U6 IHVybChJbWFnZXMvdGltZWxpbmVIb2xsb3dQaWxsR3JheS5wbmcpIDYgNyA2IDc7Ci19Ci0KICNy ZXNvdXJjZS12aWV3cyB7CiAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIHRvcDogMjNweDsK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IDQyMTcxNmM1OGQ3 NWI1NDkwOGFiOGUzYjgxMzg0ZDEyNDFhYTg1YmEuLmM1Mjc0NWY0MGE4MWQ3OTI0YTIwYjIzZDhj ZTVmMDIzZDg3NzYwOWIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5q cwpAQCAtNDY0LDcgKzQ2NCw2IEBAIFdlYkluc3BlY3Rvci5sb2FkZWQgPSBmdW5jdGlvbigpCiAg ICAgICAgIHNjcmlwdHM6IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDYXRlZ29yeSgic2NyaXB0 cyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2NyaXB0cyIpLCAicmdiKDI1NSwxMjEsMCkiKSwK ICAgICAgICAgeGhyOiBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlQ2F0ZWdvcnkoInhociIsIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiWEhSIiksICJyZ2IoMjMxLDIzMSwxMCkiKSwKICAgICAgICAg Zm9udHM6IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDYXRlZ29yeSgiZm9udHMiLCBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIkZvbnRzIiksICJyZ2IoMjU1LDgyLDYyKSIpLAotICAgICAgICB3ZWJz b2NrZXQ6IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDYXRlZ29yeSgid2Vic29ja2V0cyIsIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiV2ViU29ja2V0IiksICJyZ2IoMTg2LDE4NiwxODYpIiksIC8v IEZJWE1FOiBEZWNpZGUgdGhlIGNvbG9yLgogICAgICAgICBvdGhlcjogbmV3IFdlYkluc3BlY3Rv ci5SZXNvdXJjZUNhdGVnb3J5KCJvdGhlciIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiT3RoZXIi KSwgInJnYigxODYsMTg2LDE4NikiKQogICAgIH07CiAKQEAgLTExNjIsOCArMTE2MSw2IEBAIFdl Ykluc3BlY3Rvci51cGRhdGVSZXNvdXJjZSA9IGZ1bmN0aW9uKGlkZW50aWZpZXIsIHBheWxvYWQp CiAgICAgICAgIHJlc291cmNlLnJlcXVlc3RGb3JtRGF0YSA9IHBheWxvYWQucmVxdWVzdEZvcm1E YXRhOwogICAgICAgICByZXNvdXJjZS5jYWNoZWQgPSBwYXlsb2FkLmNhY2hlZDsKICAgICAgICAg cmVzb3VyY2UuZG9jdW1lbnRVUkwgPSBwYXlsb2FkLmRvY3VtZW50VVJMOwotICAgICAgICBpZiAo dHlwZW9mIHBheWxvYWQud2ViU29ja2V0UmVxdWVzdEtleTMgIT09ICJ1bmRlZmluZWQiKQotICAg ICAgICAgICAgcmVzb3VyY2Uud2ViU29ja2V0UmVxdWVzdEtleTMgPSBwYXlsb2FkLndlYlNvY2tl dFJlcXVlc3RLZXkzOwogCiAgICAgICAgIGlmIChyZXNvdXJjZS5tYWluUmVzb3VyY2UpCiAgICAg ICAgICAgICB0aGlzLm1haW5SZXNvdXJjZSA9IHJlc291cmNlOwpAQCAtMTE4NCw4ICsxMTgxLDYg QEAgV2ViSW5zcGVjdG9yLnVwZGF0ZVJlc291cmNlID0gZnVuY3Rpb24oaWRlbnRpZmllciwgcGF5 bG9hZCkKICAgICAgICAgcmVzb3VyY2Uuc3RhdHVzVGV4dCA9IHBheWxvYWQuc3RhdHVzVGV4dDsK ICAgICAgICAgcmVzb3VyY2Uuc3VnZ2VzdGVkRmlsZW5hbWUgPSBwYXlsb2FkLnN1Z2dlc3RlZEZp bGVuYW1lOwogICAgICAgICByZXNvdXJjZS5yZXNwb25zZUhlYWRlcnMgPSBwYXlsb2FkLnJlc3Bv bnNlSGVhZGVyczsKLSAgICAgICAgaWYgKHR5cGVvZiBwYXlsb2FkLndlYlNvY2tldENoYWxsZW5n ZVJlc3BvbnNlICE9PSAidW5kZWZpbmVkIikKLSAgICAgICAgICAgIHJlc291cmNlLndlYlNvY2tl dENoYWxsZW5nZVJlc3BvbnNlID0gcGF5bG9hZC53ZWJTb2NrZXRDaGFsbGVuZ2VSZXNwb25zZTsK ICAgICB9CiAKICAgICBpZiAocGF5bG9hZC5kaWRUeXBlQ2hhbmdlKSB7CmRpZmYgLS1naXQgYS9X ZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5jcHAgYi9XZWJDb3JlL3dlYnNvY2tl dHMvV2ViU29ja2V0Q2hhbm5lbC5jcHAKaW5kZXggYzYxOGQ4NjQ0NmIzNzNhZGJlNzM3MTJmY2E3 N2FhZDBhMWU2ZjhmMC4uNTg1OWZkN2YwNjUwN2YzMzdjMjgxODI2YWM4YzYxNGIyNzBiMjkzNSAx MDA2NDQKLS0tIGEvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldENoYW5uZWwuY3BwCisrKyBi L1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmNwcApAQCAtMzYsMTEgKzM2LDgg QEAKIAogI2luY2x1ZGUgIkNvb2tpZUphci5oIgogI2luY2x1ZGUgIkRvY3VtZW50LmgiCi0jaW5j bHVkZSAiSW5zcGVjdG9yQ29udHJvbGxlci5oIgogI2luY2x1ZGUgIkxvZ2dpbmcuaCIKLSNpbmNs dWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1TdHJpbmcuaCIKLSNpbmNsdWRlICJQcm9n cmVzc1RyYWNrZXIuaCIKICNpbmNsdWRlICJTY3JpcHRFeGVjdXRpb25Db250ZXh0LmgiCiAjaW5j bHVkZSAiU29ja2V0U3RyZWFtRXJyb3IuaCIKICNpbmNsdWRlICJTb2NrZXRTdHJlYW1IYW5kbGUu aCIKQEAgLTY1LDE0ICs2Miw3IEBAIFdlYlNvY2tldENoYW5uZWw6OldlYlNvY2tldENoYW5uZWwo U2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgV2ViU29ja2V0Q2hhCiAgICAgLCBtX3N1 c3BlbmRlZChmYWxzZSkKICAgICAsIG1fY2xvc2VkKGZhbHNlKQogICAgICwgbV91bmhhbmRsZWRC dWZmZXJlZEFtb3VudCgwKQotI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgLCBtX2lkZW50aWZp ZXIoMCkKLSNlbmRpZgogewotI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgaWYgKEluc3BlY3Rv ckNvbnRyb2xsZXIqIGNvbnRyb2xsZXIgPSBtX2NvbnRleHQtPmluc3BlY3RvckNvbnRyb2xsZXIo KSkKLSAgICAgICAgY29udHJvbGxlci0+ZGlkQ3JlYXRlV2ViU29ja2V0KGlkZW50aWZpZXIoKSwg dXJsLCBtX2NvbnRleHQtPnVybCgpKTsKLSNlbmRpZgogfQogCiBXZWJTb2NrZXRDaGFubmVsOjp+ V2ViU29ja2V0Q2hhbm5lbCgpCkBAIC0xMjEsMTEgKzExMSw2IEBAIHZvaWQgV2ViU29ja2V0Q2hh bm5lbDo6Y2xvc2UoKQogdm9pZCBXZWJTb2NrZXRDaGFubmVsOjpkaXNjb25uZWN0KCkKIHsKICAg ICBMT0coTmV0d29yaywgIldlYlNvY2tldENoYW5uZWwgJXAgZGlzY29ubmVjdCIsIHRoaXMpOwot I2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgaWYgKG1fY29udGV4dCkKLSAgICAgICAgaWYgKElu c3BlY3RvckNvbnRyb2xsZXIqIGNvbnRyb2xsZXIgPSBtX2NvbnRleHQtPmluc3BlY3RvckNvbnRy b2xsZXIoKSkKLSAgICAgICAgICAgIGNvbnRyb2xsZXItPmRpZENsb3NlV2ViU29ja2V0KGlkZW50 aWZpZXIoKSk7Ci0jZW5kaWYKICAgICBtX2hhbmRzaGFrZS5jbGVhclNjcmlwdEV4ZWN1dGlvbkNv bnRleHQoKTsKICAgICBtX2NsaWVudCA9IDA7CiAgICAgbV9jb250ZXh0ID0gMDsKQEAgLTE1MSwx MCArMTM2LDYgQEAgdm9pZCBXZWJTb2NrZXRDaGFubmVsOjpkaWRPcGVuKFNvY2tldFN0cmVhbUhh bmRsZSogaGFuZGxlKQogICAgIEFTU0VSVChoYW5kbGUgPT0gbV9oYW5kbGUpOwogICAgIGlmICgh bV9jb250ZXh0KQogICAgICAgICByZXR1cm47Ci0jaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBp ZiAoSW5zcGVjdG9yQ29udHJvbGxlciogY29udHJvbGxlciA9IG1fY29udGV4dC0+aW5zcGVjdG9y Q29udHJvbGxlcigpKQotICAgICAgICBjb250cm9sbGVyLT53aWxsU2VuZFdlYlNvY2tldEhhbmRz aGFrZVJlcXVlc3QoaWRlbnRpZmllcigpLCBtX2hhbmRzaGFrZS5jbGllbnRIYW5kc2hha2VSZXF1 ZXN0KCkpOwotI2VuZGlmCiAgICAgY29uc3QgQ1N0cmluZyYgaGFuZHNoYWtlTWVzc2FnZSA9IG1f aGFuZHNoYWtlLmNsaWVudEhhbmRzaGFrZU1lc3NhZ2UoKTsKICAgICBpZiAoIWhhbmRsZS0+c2Vu ZChoYW5kc2hha2VNZXNzYWdlLmRhdGEoKSwgaGFuZHNoYWtlTWVzc2FnZS5sZW5ndGgoKSkpIHsK ICAgICAgICAgbV9jb250ZXh0LT5hZGRNZXNzYWdlKEpTTWVzc2FnZVNvdXJjZSwgTG9nTWVzc2Fn ZVR5cGUsIEVycm9yTWVzc2FnZUxldmVsLCAiRXJyb3Igc2VuZGluZyBoYW5kc2hha2UgbWVzc2Fn ZS4iLCAwLCBtX2hhbmRzaGFrZS5jbGllbnRPcmlnaW4oKSk7CkBAIC0xNjUsMTEgKzE0Niw2IEBA IHZvaWQgV2ViU29ja2V0Q2hhbm5lbDo6ZGlkT3BlbihTb2NrZXRTdHJlYW1IYW5kbGUqIGhhbmRs ZSkKIHZvaWQgV2ViU29ja2V0Q2hhbm5lbDo6ZGlkQ2xvc2UoU29ja2V0U3RyZWFtSGFuZGxlKiBo YW5kbGUpCiB7CiAgICAgTE9HKE5ldHdvcmssICJXZWJTb2NrZXRDaGFubmVsICVwIGRpZENsb3Nl IiwgdGhpcyk7Ci0jaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBpZiAobV9jb250ZXh0KQotICAg ICAgICBpZiAoSW5zcGVjdG9yQ29udHJvbGxlciogY29udHJvbGxlciA9IG1fY29udGV4dC0+aW5z cGVjdG9yQ29udHJvbGxlcigpKQotICAgICAgICAgICAgY29udHJvbGxlci0+ZGlkQ2xvc2VXZWJT b2NrZXQoaWRlbnRpZmllcigpKTsKLSNlbmRpZgogICAgIEFTU0VSVF9VTlVTRUQoaGFuZGxlLCBo YW5kbGUgPT0gbV9oYW5kbGUgfHwgIW1faGFuZGxlKTsKICAgICBtX2Nsb3NlZCA9IHRydWU7CiAg ICAgaWYgKG1faGFuZGxlKSB7CkBAIC0yNjEsMTAgKzIzNyw2IEBAIGJvb2wgV2ViU29ja2V0Q2hh bm5lbDo6cHJvY2Vzc0J1ZmZlcigpCiAgICAgICAgIGlmIChoZWFkZXJMZW5ndGggPD0gMCkKICAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgaWYgKG1faGFuZHNoYWtlLm1vZGUoKSA9 PSBXZWJTb2NrZXRIYW5kc2hha2U6OkNvbm5lY3RlZCkgewotI2lmIEVOQUJMRShJTlNQRUNUT1Ip Ci0gICAgICAgICAgICBpZiAoSW5zcGVjdG9yQ29udHJvbGxlciogY29udHJvbGxlciA9IG1fY29u dGV4dC0+aW5zcGVjdG9yQ29udHJvbGxlcigpKQotICAgICAgICAgICAgICAgIGNvbnRyb2xsZXIt PmRpZFJlY2VpdmVXZWJTb2NrZXRIYW5kc2hha2VSZXNwb25zZShpZGVudGlmaWVyKCksIG1faGFu ZHNoYWtlLnNlcnZlckhhbmRzaGFrZVJlc3BvbnNlKCkpOwotI2VuZGlmCiAgICAgICAgICAgICBp ZiAoIW1faGFuZHNoYWtlLnNlcnZlclNldENvb2tpZSgpLmlzRW1wdHkoKSkgewogICAgICAgICAg ICAgICAgIGlmIChtX2NvbnRleHQtPmlzRG9jdW1lbnQoKSkgewogICAgICAgICAgICAgICAgICAg ICBEb2N1bWVudCogZG9jdW1lbnQgPSBzdGF0aWNfY2FzdDxEb2N1bWVudCo+KG1fY29udGV4dCk7 CkBAIC0zNTYsMjEgKzMyOCw2IEBAIHZvaWQgV2ViU29ja2V0Q2hhbm5lbDo6cmVzdW1lVGltZXJG aXJlZChUaW1lcjxXZWJTb2NrZXRDaGFubmVsPiogdGltZXIpCiAgICAgICAgIGRpZENsb3NlKG1f aGFuZGxlLmdldCgpKTsKIH0KIAotI2lmIEVOQUJMRShJTlNQRUNUT1IpCi11bnNpZ25lZCBsb25n IFdlYlNvY2tldENoYW5uZWw6OmlkZW50aWZpZXIoKQotewotICAgIGlmIChtX2lkZW50aWZpZXIp Ci0gICAgICAgIHJldHVybiBtX2lkZW50aWZpZXI7Ci0KLSAgICBpZiAoSW5zcGVjdG9yQ29udHJv bGxlciogY29udHJvbGxlciA9IG1fY29udGV4dC0+aW5zcGVjdG9yQ29udHJvbGxlcigpKQotICAg ICAgICBpZiAoUGFnZSogcGFnZSA9IGNvbnRyb2xsZXItPmluc3BlY3RlZFBhZ2UoKSkKLSAgICAg ICAgICAgIG1faWRlbnRpZmllciA9IHBhZ2UtPnByb2dyZXNzKCktPmNyZWF0ZVVuaXF1ZUlkZW50 aWZpZXIoKTsKLQotICAgIEFTU0VSVChtX2lkZW50aWZpZXIpOwotICAgIHJldHVybiBtX2lkZW50 aWZpZXI7Ci19Ci0jZW5kaWYgLy8gRU5BQkxFKElOU1BFQ1RPUikKLQogfSAgLy8gbmFtZXNwYWNl IFdlYkNvcmUKIAogI2VuZGlmICAvLyBFTkFCTEUoV0VCX1NPQ0tFVFMpCmRpZmYgLS1naXQgYS9X ZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5oIGIvV2ViQ29yZS93ZWJzb2NrZXRz L1dlYlNvY2tldENoYW5uZWwuaAppbmRleCA0OGM1MWNjZjFiM2I5MDZjZTUzYTljODVmMDUwZTBj OTM2MTJlNTg2Li5hOTBjNmRjMTFmMmNkOGE5NTA0NzJkYmFmZjg1NDFhM2E5NGEwYTRlIDEwMDY0 NAotLS0gYS9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5oCisrKyBiL1dlYkNv cmUvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmgKQEAgLTg0LDEwICs4NCw2IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBwcm9jZXNzQnVmZmVyKCk7CiAgICAgICAgIHZv aWQgcmVzdW1lVGltZXJGaXJlZChUaW1lcjxXZWJTb2NrZXRDaGFubmVsPiogdGltZXIpOwogCi0j aWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICAgICAgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKCk7 Ci0jZW5kaWYKLQogICAgICAgICBTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBtX2NvbnRleHQ7CiAg ICAgICAgIFdlYlNvY2tldENoYW5uZWxDbGllbnQqIG1fY2xpZW50OwogICAgICAgICBXZWJTb2Nr ZXRIYW5kc2hha2UgbV9oYW5kc2hha2U7CkBAIC05OSwxMCArOTUsNiBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgICAgIGJvb2wgbV9zdXNwZW5kZWQ7CiAgICAgICAgIGJvb2wgbV9jbG9zZWQ7 CiAgICAgICAgIHVuc2lnbmVkIGxvbmcgbV91bmhhbmRsZWRCdWZmZXJlZEFtb3VudDsKLQotI2lm IEVOQUJMRShJTlNQRUNUT1IpCi0gICAgICAgIHVuc2lnbmVkIGxvbmcgbV9pZGVudGlmaWVyOwot I2VuZGlmCiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=