125818 2013-12-16 17:05:00 -0800 Web Inspector: Use JSC::SourceID and JSC::BreakpointID instead of WebCore dups 2013-12-16 17:33:39 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 joepeck webkit-unassigned commit-queue graouts joepeck mark.lam timothy webkit-bug-importer oldest_to_newest 960311 0 joepeck 2013-12-16 17:05:00 -0800 Since WebKit no longer needs to support multiple JavaScript engines, we should just start using JSC types throughout Inspector source. SourceID and BreakpointID are good examples, they are just typedefs of the JSC types. 960315 1 219373 joepeck 2013-12-16 17:06:46 -0800 Created attachment 219373 [PATCH] Proposed Fix 960317 2 mark.lam 2013-12-16 17:13:11 -0800 r=me 960330 3 219373 commit-queue 2013-12-16 17:33:37 -0800 Comment on attachment 219373 [PATCH] Proposed Fix Clearing flags on attachment: 219373 Committed r160682: <http://trac.webkit.org/changeset/160682> 960331 4 commit-queue 2013-12-16 17:33:39 -0800 All reviewed patches have been landed. Closing bug. 219373 2013-12-16 17:06:46 -0800 2013-12-16 17:33:37 -0800 [PATCH] Proposed Fix ids.patch text/plain 30738 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4MTQ0MzM0Li4xZjg1ODI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDAg QEAKIDIwMTMtMTItMTYgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBVc2UgSlNDOjpTb3VyY2VJRCBhbmQgSlNDOjpCcmVha3Bv aW50SUQgaW5zdGVhZCBvZiBXZWJDb3JlIGR1cHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTgxOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSB0aGUgV2ViQ29yZSB0eXBlZGVmcyBvZiBKU0Mg dHlwZXMuIFByZWZlciBKU0MgbmFtZXNwYWNlCisgICAgICAgIHByZWZpeGVkIHR5cGVzIHRocm91 Z2hvdXQgV2ViQ29yZSdzIEluc3BlY3RvciBjb2RlLgorCisgICAgICAgICogR05VbWFrZWZpbGUu bGlzdC5hbToKKyAgICAgICAgKiBXZWJDb3JlLnZjeHByb2ovV2ViQ29yZS52Y3hwcm9qOgorICAg ICAgICAqIFdlYkNvcmUudmN4cHJvai9XZWJDb3JlLnZjeHByb2ouZmlsdGVyczoKKyAgICAgICAg KiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICogYmluZGluZ3Mv anMvQnJlYWtwb2ludElELmg6IFJlbW92ZWQuCisgICAgICAgICogYmluZGluZ3MvanMvU2NyaXB0 RGVidWdTZXJ2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0RGVidWdTZXJ2ZXI6OnNl dEJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0RGVidWdTZXJ2ZXI6OnJlbW92 ZUJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0RGVidWdTZXJ2ZXI6OmRpc3Bh dGNoRGlkUGFyc2VTb3VyY2UpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2Vy dmVyLmg6CisgICAgICAgICogYmluZGluZ3MvanMvU291cmNlSUQuaDogUmVtb3ZlZC4KKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50KToKKyAg ICAgICAgKFdlYkNvcmU6OnBhcnNlTG9jYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yRGVidWdnZXJBZ2VudDo6c2V0QnJlYWtwb2ludCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JEZWJ1Z2dlckFnZW50Ojpjb250aW51ZVRvTG9jYXRpb24pOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6cmVzb2x2ZUJyZWFrcG9pbnQpOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6c2VhcmNoSW5Db250ZW50KToKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmdldFNjcmlwdFNvdXJjZSk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpkaWRQYXJzZVNvdXJjZSk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpkaWRQYXVzZSk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpjbGVhcik6CisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaDoKKyAgICAgICAgKiBpbnNwZWN0 b3IvU2NyaXB0RGVidWdMaXN0ZW5lci5oOgorCisyMDEzLTEyLTE2ICBKb3NlcGggUGVjb3Jhcm8g IDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgRml4IHNvbWUgd2hpdGVzcGFjZSBpc3N1 ZXMgaW4gaW5zcGVjdG9yIGNvZGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEyNTgxNAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9HTlVtYWtl ZmlsZS5saXN0LmFtIGIvU291cmNlL1dlYkNvcmUvR05VbWFrZWZpbGUubGlzdC5hbQppbmRleCA2 MGIzNzBjLi5hYTczMjc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9HTlVtYWtlZmlsZS5s aXN0LmFtCisrKyBiL1NvdXJjZS9XZWJDb3JlL0dOVW1ha2VmaWxlLmxpc3QuYW0KQEAgLTIyNjMs NyArMjI2Myw2IEBAIHdlYmNvcmVfc291cmNlcyArPSBcCiAJU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvZ2VuZXJpYy9SdW50aW1lRW5hYmxlZEZlYXR1cmVzLmggXAogCVNvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL2pzL0FycmF5VmFsdWUuY3BwIFwKIAlTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9B cnJheVZhbHVlLmggXAotCVNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0JyZWFrcG9pbnRJRC5o IFwKIAlTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9DYWNoZWRTY3JpcHRTb3VyY2VQcm92aWRl ci5oIFwKIAlTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9DYWxsYmFja0Z1bmN0aW9uLmNwcCBc CiAJU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvQ2FsbGJhY2tGdW5jdGlvbi5oIFwKQEAgLTI0 NjUsNyArMjQ2NCw2IEBAIHdlYmNvcmVfc291cmNlcyArPSBcCiAJU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvU2NyaXB0V3JhcHBhYmxlSW5saW5lcy5oIFwKIAlTb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9TZXJpYWxpemVkU2NyaXB0VmFsdWUuY3BwIFwKIAlTb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9TZXJpYWxpemVkU2NyaXB0VmFsdWUuaCBcCi0JU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvU291cmNlSUQuaCBcCiAJU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvV2ViQ29yZUpT Q2xpZW50RGF0YS5oIFwKIAlTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9XZWJDb3JlVHlwZWRB cnJheUNvbnRyb2xsZXIuY3BwIFwKIAlTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9XZWJDb3Jl VHlwZWRBcnJheUNvbnRyb2xsZXIuaCBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLnZjeHByb2ovV2ViQ29yZS52Y3hwcm9qIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3hw cm9qL1dlYkNvcmUudmN4cHJvagppbmRleCA2ZWUxZjUwLi4xNzc0YWVkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjeHByb2ovV2ViQ29yZS52Y3hwcm9qCisrKyBiL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUudmN4cHJvai9XZWJDb3JlLnZjeHByb2oKQEAgLTIwNTkwLDcgKzIw NTkwLDYgQEAKICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXGJpbmRpbmdzXGdlbmVyaWNcQWN0 aXZlRE9NQ2FsbGJhY2suaCIgLz4KICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXGJpbmRpbmdz XGdlbmVyaWNcUnVudGltZUVuYWJsZWRGZWF0dXJlcy5oIiAvPgogICAgIDxDbEluY2x1ZGUgSW5j bHVkZT0iLi5cYmluZGluZ3NcanNcQXJyYXlWYWx1ZS5oIiAvPgotICAgIDxDbEluY2x1ZGUgSW5j bHVkZT0iLi5cYmluZGluZ3NcanNcQnJlYWtwb2ludElELmgiIC8+CiAgICAgPENsSW5jbHVkZSBJ bmNsdWRlPSIuLlxiaW5kaW5nc1xqc1xDYWNoZWRTY3JpcHRTb3VyY2VQcm92aWRlci5oIiAvPgog ICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5cYmluZGluZ3NcanNcQ2FsbGJhY2tGdW5jdGlvbi5o IiAvPgogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5cYmluZGluZ3NcanNcRGljdGlvbmFyeS5o IiAvPgpAQCAtMjA2NDAsNyArMjA2MzksNiBAQAogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5c YmluZGluZ3NcanNcU2NyaXB0U3RhdGUuaCIgLz4KICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4u XGJpbmRpbmdzXGpzXFNjcmlwdFdyYXBwYWJsZS5oIiAvPgogICAgIDxDbEluY2x1ZGUgSW5jbHVk ZT0iLi5cYmluZGluZ3NcanNcU2VyaWFsaXplZFNjcmlwdFZhbHVlLmgiIC8+Ci0gICAgPENsSW5j bHVkZSBJbmNsdWRlPSIuLlxiaW5kaW5nc1xqc1xTb3VyY2VJRC5oIiAvPgogICAgIDxDbEluY2x1 ZGUgSW5jbHVkZT0iLi5cYmluZGluZ3NcanNcV2ViQ29yZUpTQ2xpZW50RGF0YS5oIiAvPgogICAg IDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5cYmluZGluZ3NcanNcV29ya2VyU2NyaXB0Q29udHJvbGxl ci5oIiAvPgogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5ccGx1Z2luc1xET01NaW1lVHlwZS5o IiAvPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3hwcm9qL1dlYkNvcmUu dmN4cHJvai5maWx0ZXJzIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3hwcm9qL1dlYkNvcmUu dmN4cHJvai5maWx0ZXJzCmluZGV4IDRhZGQwZjIuLmFkMGQ1MDEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUudmN4cHJvai9XZWJDb3JlLnZjeHByb2ouZmlsdGVycworKysgYi9T b3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjeHByb2ovV2ViQ29yZS52Y3hwcm9qLmZpbHRlcnMKQEAg LTExMzk5LDkgKzExMzk5LDYgQEAKICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXGJpbmRpbmdz XGpzXEFycmF5VmFsdWUuaCI+CiAgICAgICA8RmlsdGVyPmJpbmRpbmdzXGpzPC9GaWx0ZXI+CiAg ICAgPC9DbEluY2x1ZGU+Ci0gICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxiaW5kaW5nc1xqc1xC cmVha3BvaW50SUQuaCI+Ci0gICAgICA8RmlsdGVyPmJpbmRpbmdzXGpzPC9GaWx0ZXI+Ci0gICAg PC9DbEluY2x1ZGU+CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxiaW5kaW5nc1xqc1xDYWNo ZWRTY3JpcHRTb3VyY2VQcm92aWRlci5oIj4KICAgICAgIDxGaWx0ZXI+YmluZGluZ3NcanM8L0Zp bHRlcj4KICAgICA8L0NsSW5jbHVkZT4KQEAgLTExNTMxLDkgKzExNTI4LDYgQEAKICAgICA8Q2xJ bmNsdWRlIEluY2x1ZGU9Ii4uXGJpbmRpbmdzXGpzXFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5oIj4K ICAgICAgIDxGaWx0ZXI+YmluZGluZ3NcanM8L0ZpbHRlcj4KICAgICA8L0NsSW5jbHVkZT4KLSAg ICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXGJpbmRpbmdzXGpzXFNvdXJjZUlELmgiPgotICAgICAg PEZpbHRlcj5iaW5kaW5nc1xqczwvRmlsdGVyPgotICAgIDwvQ2xJbmNsdWRlPgogICAgIDxDbElu Y2x1ZGUgSW5jbHVkZT0iLi5cYmluZGluZ3NcanNcV2ViQ29yZUpTQ2xpZW50RGF0YS5oIj4KICAg ICAgIDxGaWx0ZXI+YmluZGluZ3NcanM8L0ZpbHRlcj4KICAgICA8L0NsSW5jbHVkZT4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBi L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA5 ZjMyNjE2Li40NTBkN2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qCkBAIC02Mjk3LDcgKzYyOTcsNiBAQAogCQlGRTE2Q0ZENDE2OUQx REVEMDBEM0EwQzcgLyogRGF0YWJhc2VCYWNrZW5kLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRTE2Q0ZEMDE2OUQxREVDMDBEM0EwQzcgLyogRGF0YWJh c2VCYWNrZW5kLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsg fTsKIAkJRkUxNkNGRDUxNjlEMURFRDAwRDNBMEM3IC8qIERhdGFiYXNlQmFja2VuZFN5bmMuY3Bw IGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRkUxNkNGRDEx NjlEMURFQzAwRDNBMEM3IC8qIERhdGFiYXNlQmFja2VuZFN5bmMuY3BwICovOyB9OwogCQlGRTE2 Q0ZENjE2OUQxREVEMDBEM0EwQzcgLyogRGF0YWJhc2VCYWNrZW5kU3luYy5oIGluIEhlYWRlcnMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRkUxNkNGRDIxNjlEMURFQzAwRDNB MEM3IC8qIERhdGFiYXNlQmFja2VuZFN5bmMuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9 IChQcml2YXRlLCApOyB9OyB9OwotCQlGRTIxM0IyOTE4MkJFOUY4MDBBRDJEMTIgLyogU291cmNl SUQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZFMjEz QjI4MTgyQkU5RjgwMEFEMkQxMiAvKiBTb3VyY2VJRC5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJV VEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCUZFMzM3MUEyMTY3QzExRDQwMEVEQjc1MiAvKiBE YXRhYmFzZUJhc2ljVHlwZXMuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IEZFMzM3MUEwMTY3QzExRDQwMEVEQjc1MiAvKiBEYXRhYmFzZUJhc2ljVHlwZXMu aCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQlGRTM2 RkQxNTE2Qzc4MjY1MDBGODg3QzEgLyogQ2hhbmdlVmVyc2lvbkRhdGEuaCBpbiBIZWFkZXJzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZFMzZGRDExMTZDNzgyNjQwMEY4ODdD MSAvKiBDaGFuZ2VWZXJzaW9uRGF0YS5oICovOyB9OwogCQlGRTM2RkQxNjE2Qzc4MjY1MDBGODg3 QzEgLyogU1FMVHJhbnNhY3Rpb25TdGF0ZU1hY2hpbmUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRkUzNkZEMTIxNkM3ODI2NDAwRjg4N0MxIC8qIFNR TFRyYW5zYWN0aW9uU3RhdGVNYWNoaW5lLmNwcCAqLzsgfTsKQEAgLTYzMzEsNyArNjMzMCw2IEBA CiAJCUZFRDEzRDNBMENFQTkzNDYwMEQ4OTQ2NiAvKiBFZGl0b3JJT1MubW0gaW4gU291cmNlcyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRUQxM0QzOTBDRUE5MzQ2MDBEODk0 NjYgLyogRWRpdG9ySU9TLm1tICovOyB9OwogCQlGRUQxM0Q1MjBDRUE5NDk3MDBEODk0NjYgLyog UmVuZGVyVGhlbWVJT1MuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IEZFRDEzRDUwMENFQTk0OTcwMEQ4OTQ2NiAvKiBSZW5kZXJUaGVtZUlPUy5oICovOyB9 OwogCQlGRUQ0ODM5MENFRDY2QzMyNTVGNzJDNTkgLyogTWF0aE1MU2VsZWN0RWxlbWVudC5jcHAg aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNzVBMDU5QUYx NzBEOEZBQTVCOENBQkUgLyogTWF0aE1MU2VsZWN0RWxlbWVudC5jcHAgKi87IH07Ci0JCUZFREJG RjE2MTgyQjdBOEQwMDE3RkE2NCAvKiBCcmVha3BvaW50SUQuaCBpbiBIZWFkZXJzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZFREJGRjE0MTgyQjdBOEQwMDE3RkE2NCAvKiBC cmVha3BvaW50SUQuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9 OyB9OwogCQlGRURFRjg0MTE2Nzk3MTA4MDAwRTQ0NEEgLyogRGF0YWJhc2VTdHJhdGVneS5jcHAg aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRURFRjgzRjE2 Nzk3MTA4MDAwRTQ0NEEgLyogRGF0YWJhc2VTdHJhdGVneS5jcHAgKi87IH07CiAJCUZFREVGODQy MTY3OTcxMDgwMDBFNDQ0QSAvKiBEYXRhYmFzZVN0cmF0ZWd5LmggaW4gSGVhZGVycyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRURFRjg0MDE2Nzk3MTA4MDAwRTQ0NEEgLyog RGF0YWJhc2VTdHJhdGVneS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUs ICk7IH07IH07CiAJCUZFRTE4MTEzMTZDMzE5RTgwMDA4NDg0OSAvKiBTUUxUcmFuc2FjdGlvbkJh Y2tlbmQuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g RkVFMTgxMTExNkMzMTlFODAwMDg0ODQ5IC8qIFNRTFRyYW5zYWN0aW9uQmFja2VuZC5jcHAgKi87 IH07CkBAIC0xMzUyNyw3ICsxMzUyNSw2IEBACiAJCUZFMTZDRkQwMTY5RDFERUMwMEQzQTBDNyAv KiBEYXRhYmFzZUJhY2tlbmQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gRGF0 YWJhc2VCYWNrZW5kLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUZFMTZDRkQxMTY5 RDFERUMwMEQzQTBDNyAvKiBEYXRhYmFzZUJhY2tlbmRTeW5jLmNwcCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuY3BwLmNwcDsgcGF0aCA9IERhdGFiYXNlQmFja2VuZFN5bmMuY3BwOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwogCQlGRTE2Q0ZEMjE2OUQxREVDMDBEM0EwQzcgLyogRGF0YWJhc2VC YWNrZW5kU3luYy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBEYXRhYmFzZUJh Y2tlbmRTeW5jLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07Ci0JCUZFMjEzQjI4MTgyQkU5 RjgwMEFEMkQxMiAvKiBTb3VyY2VJRC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGgg PSBTb3VyY2VJRC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlGRTMzNzFBMDE2N0Mx MUQ0MDBFREI3NTIgLyogRGF0YWJhc2VCYXNpY1R5cGVzLmggKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmMuaDsgcGF0aCA9IERhdGFiYXNlQmFzaWNUeXBlcy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwogCQlGRTM2RkQxMTE2Qzc4MjY0MDBGODg3QzEgLyogQ2hhbmdlVmVyc2lvbkRhdGEuaCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQ2hhbmdlVmVyc2lvbkRhdGEuaDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJRkUzNkZEMTIxNkM3ODI2NDAwRjg4N0MxIC8qIFNR TFRyYW5zYWN0aW9uU3RhdGVNYWNoaW5lLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNw cDsgcGF0aCA9IFNRTFRyYW5zYWN0aW9uU3RhdGVNYWNoaW5lLmNwcDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKQEAgLTEzNTYwLDcgKzEzNTU3LDYgQEAKIAkJRkVCQzVGMzAxNkJEMENDMzAw NjU5QkQzIC8qIERhdGFiYXNlQmFzZS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGgg PSBEYXRhYmFzZUJhc2UuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJRkVEMTNEMzkw Q0VBOTM0NjAwRDg5NDY2IC8qIEVkaXRvcklPUy5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3Bw Lm9iamNwcDsgcGF0aCA9IEVkaXRvcklPUy5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK IAkJRkVEMTNENTAwQ0VBOTQ5NzAwRDg5NDY2IC8qIFJlbmRlclRoZW1lSU9TLmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFJlbmRlclRoZW1lSU9TLmg7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07Ci0JCUZFREJGRjE0MTgyQjdBOEQwMDE3RkE2NCAvKiBCcmVha3BvaW50SUQu aCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQnJlYWtwb2ludElELmg7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUZFREVGODNGMTY3OTcxMDgwMDBFNDQ0QSAvKiBEYXRh YmFzZVN0cmF0ZWd5LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IERh dGFiYXNlU3RyYXRlZ3kuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlGRURFRjg0 MDE2Nzk3MTA4MDAwRTQ0NEEgLyogRGF0YWJhc2VTdHJhdGVneS5oICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jLmg7IHBhdGggPSBEYXRhYmFzZVN0cmF0ZWd5Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CiAJCUZFRTE4MTExMTZDMzE5RTgwMDA4NDg0OSAvKiBTUUxUcmFuc2FjdGlvbkJhY2tl bmQuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gU1FMVHJhbnNhY3Rp b25CYWNrZW5kLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTE5NjA5LDcgKzE5 NjA1LDYgQEAKIAkJQkMxQTM3OTMwOTdDNkZCMTAwMTlGM0Q4IC8qIGpzICovID0gewogCQkJaXNh ID0gUEJYR3JvdXA7CiAJCQljaGlsZHJlbiA9ICgKLQkJCQlGRTIxM0IyODE4MkJFOUY4MDBBRDJE MTIgLyogU291cmNlSUQuaCAqLywKIAkJCQlCQ0NFNThBNzEwNjFFODJGMDA4RkIzNUEgLyogQ2Fs bGJhY2sgT2JqZWN0cyAqLywKIAkJCQlCQ0NFNThCNDEwNjFFOTI1MDA4RkIzNUEgLyogQ29uc3Ry dWN0b3JzICovLAogCQkJCUJDNEVERUY3MEMwOEY0MTQwMDdFREQ0OSAvKiBDdXN0b20gKi8sCkBA IC0xOTYxNyw3ICsxOTYxMiw2IEBACiAJCQkJOTNGOEIzMDYwQTMwMEZFQTAwRjYxQUI4IC8qIENv ZGVHZW5lcmF0b3JKUy5wbSAqLywKIAkJCQk0OUIzNzYwQTE1QzZDNjg0MDA1OTEzMUQgLyogQXJy YXlWYWx1ZS5jcHAgKi8sCiAJCQkJNDlCMzc2MEIxNUM2QzY4NDAwNTkxMzFEIC8qIEFycmF5VmFs dWUuaCAqLywKLQkJCQlGRURCRkYxNDE4MkI3QThEMDAxN0ZBNjQgLyogQnJlYWtwb2ludElELmgg Ki8sCiAJCQkJQkNENTMzNjMwRUQ2ODQ4OTAwODg3NDY4IC8qIENhY2hlZFNjcmlwdFNvdXJjZVBy b3ZpZGVyLmggKi8sCiAJCQkJMzEyRDY3QjAxNTM1NjkxRjAwNTYzRDBEIC8qIERpY3Rpb25hcnku Y3BwICovLAogCQkJCTMxNjAyM0VGMTUzMkM0MEMwMEQ1MEZGNCAvKiBEaWN0aW9uYXJ5LmggKi8s CkBAIC0yMjEwMiw3ICsyMjA5Niw2IEBACiAJCQkJNkUwRTU2OUMxODNCRkZFNjAwRTBFOEQ1IC8q IEZsb2F0Um91bmRlZFJlY3QuaCBpbiBIZWFkZXJzICovLAogCQkJCTlBMTE0MjA0MTgzMkQxMzUw MDBCQjhBRCAvKiBWYWx1ZVRvU3RyaW5nLmggaW4gSGVhZGVycyAqLywKIAkJCQk5MzJBRDcwNjE3 RUZBMkM0MDAzOEY4RkYgLyogTWFpbkZyYW1lLmggaW4gSGVhZGVycyAqLywKLQkJCQlGRURCRkYx NjE4MkI3QThEMDAxN0ZBNjQgLyogQnJlYWtwb2ludElELmggaW4gSGVhZGVycyAqLywKIAkJCQlG RTExNUZBQjE2Nzk4OENEMDAyNDkxMzQgLyogQWJzdHJhY3REYXRhYmFzZVNlcnZlci5oIGluIEhl YWRlcnMgKi8sCiAJCQkJOUE1MjhFODQxN0Q3RjUyRjAwQUE5NTE4IC8qIEZsb2F0aW5nT2JqZWN0 cy5oIGluIEhlYWRlcnMgKi8sCiAJCQkJRkU0QUFERUUxNkQyQzM3NDAwMDI2RkZDIC8qIEFic3Ry YWN0U1FMU3RhdGVtZW50LmggaW4gSGVhZGVycyAqLywKQEAgLTIyMTQzLDcgKzIyMTM2LDYgQEAK IAkJCQlCQ0Y3RTQ5MTEzN0NEN0M3MDAxRERBRTcgLyogQWRqdXN0Vmlld1NpemVPck5vdC5oIGlu IEhlYWRlcnMgKi8sCiAJCQkJODREMEM0MDYxMTE1RjFFQTAwMThBQTM0IC8qIEFmZmluZVRyYW5z Zm9ybS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQ0VEQTEyRDcxNTJDQTFDQjAwRDlFMDhEIC8qIEFs dGVybmF0aXZlVGV4dENsaWVudC5oIGluIEhlYWRlcnMgKi8sCi0JCQkJRkUyMTNCMjkxODJCRTlG ODAwQUQyRDEyIC8qIFNvdXJjZUlELmggaW4gSGVhZGVycyAqLywKIAkJCQlDRTA4QzNEMjE1MkI1 OTlBMDAyMUI4QzIgLyogQWx0ZXJuYXRpdmVUZXh0Q29udHJvbGxlci5oIGluIEhlYWRlcnMgKi8s CiAJCQkJQ0U3QjJEQjMxNTg2QUJBRDAwOThCM0ZBIC8qIEFsdGVybmF0aXZlVGV4dFVJQ29udHJv bGxlci5oIGluIEhlYWRlcnMgKi8sCiAJCQkJRkQzMTYwM0UxMkIwMjY3NjAwQzFBMzU5IC8qIEFu YWx5c2VyTm9kZS5oIGluIEhlYWRlcnMgKi8sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9CcmVha3BvaW50SUQuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0Jy ZWFrcG9pbnRJRC5oCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBlZjRkNGI3Li4wMDAw MDAwCi0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0JyZWFrcG9pbnRJRC5oCisrKyAv ZGV2L251bGwKQEAgLTEsNDIgKzAsMCBAQAotLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMyBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKgotICogUmVkaXN0cmlidXRpb24gYW5kIHVz ZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0Ci0gKiBtb2RpZmlj YXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlv bnMKLSAqIGFyZSBtZXQ6Ci0gKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVz dCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgotICogMi4gUmVkaXN0cmli dXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQK LSAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lciBpbiB0aGUKLSAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVy aWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCi0gKgotICogVEhJUyBTT0ZUV0FS RSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIGBgQVMgSVMnJyBBTkQgQU5ZCi0gKiBFWFBSRVNT IE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRI RQotICogSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBG T1IgQSBQQVJUSUNVTEFSCi0gKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQg U0hBTEwgQVBQTEUgSU5DLiBPUgotICogQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJ UkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsCi0gKiBFWEVNUExBUlksIE9SIENP TlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCi0gKiBQ Uk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwg REFUQSwgT1IKLSAqIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBD QVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKLSAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05U UkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAotICogKElOQ0xVRElORyBORUdMSUdFTkNF IE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCi0gKiBPRiBU SElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLiAKLSAqLwotCi0jaWZuZGVmIEJyZWFrcG9pbnRJRF9oCi0jZGVmaW5lIEJyZWFrcG9p bnRJRF9oCi0KLSNpZiBFTkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikKLQotI2luY2x1ZGUgPGRl YnVnZ2VyL0RlYnVnZ2VyLmg+Ci0KLW5hbWVzcGFjZSBXZWJDb3JlIHsKLQotdHlwZWRlZiBKU0M6 OkJyZWFrcG9pbnRJRCBCcmVha3BvaW50SUQ7Ci1jb25zdCBCcmVha3BvaW50SUQgbm9CcmVha3Bv aW50SUQgPSBKU0M6Om5vQnJlYWtwb2ludElEOwotCi19IC8vIG5hbWVzcGFjZSBXZWJDb3JlCi0K LSNlbmRpZiAvLyBFTkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikKLQotI2VuZGlmIC8vIEJyZWFr cG9pbnRJRF9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRE ZWJ1Z1NlcnZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHREZWJ1Z1Nl cnZlci5jcHAKaW5kZXggMjNkNGE2Mi4uNDJhYTU5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvanMvU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcApAQCAtNjYsMTQgKzY2LDE0IEBAIFNj cmlwdERlYnVnU2VydmVyOjp+U2NyaXB0RGVidWdTZXJ2ZXIoKQogewogfQogCi1CcmVha3BvaW50 SUQgU2NyaXB0RGVidWdTZXJ2ZXI6OnNldEJyZWFrcG9pbnQoU291cmNlSUQgc291cmNlSUQsIGNv bnN0IFNjcmlwdEJyZWFrcG9pbnQmIHNjcmlwdEJyZWFrcG9pbnQsIHVuc2lnbmVkKiBhY3R1YWxM aW5lTnVtYmVyLCB1bnNpZ25lZCogYWN0dWFsQ29sdW1uTnVtYmVyKQorSlNDOjpCcmVha3BvaW50 SUQgU2NyaXB0RGVidWdTZXJ2ZXI6OnNldEJyZWFrcG9pbnQoSlNDOjpTb3VyY2VJRCBzb3VyY2VJ RCwgY29uc3QgU2NyaXB0QnJlYWtwb2ludCYgc2NyaXB0QnJlYWtwb2ludCwgdW5zaWduZWQqIGFj dHVhbExpbmVOdW1iZXIsIHVuc2lnbmVkKiBhY3R1YWxDb2x1bW5OdW1iZXIpCiB7CiAgICAgaWYg KCFzb3VyY2VJRCkKLSAgICAgICAgcmV0dXJuIG5vQnJlYWtwb2ludElEOworICAgICAgICByZXR1 cm4gSlNDOjpub0JyZWFrcG9pbnRJRDsKIAogICAgIEpTQzo6QnJlYWtwb2ludCBicmVha3BvaW50 KHNvdXJjZUlELCBzY3JpcHRCcmVha3BvaW50LmxpbmVOdW1iZXIsIHNjcmlwdEJyZWFrcG9pbnQu Y29sdW1uTnVtYmVyLCBzY3JpcHRCcmVha3BvaW50LmNvbmRpdGlvbiwgc2NyaXB0QnJlYWtwb2lu dC5hdXRvQ29udGludWUpOwotICAgIEJyZWFrcG9pbnRJRCBpZCA9IERlYnVnZ2VyOjpzZXRCcmVh a3BvaW50KGJyZWFrcG9pbnQsICphY3R1YWxMaW5lTnVtYmVyLCAqYWN0dWFsQ29sdW1uTnVtYmVy KTsKLSAgICBpZiAoaWQgIT0gbm9CcmVha3BvaW50SUQgJiYgIXNjcmlwdEJyZWFrcG9pbnQuYWN0 aW9ucy5pc0VtcHR5KCkpIHsKKyAgICBKU0M6OkJyZWFrcG9pbnRJRCBpZCA9IERlYnVnZ2VyOjpz ZXRCcmVha3BvaW50KGJyZWFrcG9pbnQsICphY3R1YWxMaW5lTnVtYmVyLCAqYWN0dWFsQ29sdW1u TnVtYmVyKTsKKyAgICBpZiAoaWQgIT0gSlNDOjpub0JyZWFrcG9pbnRJRCAmJiAhc2NyaXB0QnJl YWtwb2ludC5hY3Rpb25zLmlzRW1wdHkoKSkgewogI2lmbmRlZiBOREVCVUcKICAgICAgICAgQnJl YWtwb2ludElEVG9BY3Rpb25zTWFwOjppdGVyYXRvciBpdCA9IG1fYnJlYWtwb2ludElEVG9BY3Rp b25zLmZpbmQoaWQpOwogICAgICAgICBBU1NFUlQoaXQgPT0gbV9icmVha3BvaW50SURUb0FjdGlv bnMuZW5kKCkpOwpAQCAtODQsOSArODQsOSBAQCBCcmVha3BvaW50SUQgU2NyaXB0RGVidWdTZXJ2 ZXI6OnNldEJyZWFrcG9pbnQoU291cmNlSUQgc291cmNlSUQsIGNvbnN0IFNjcmlwdEJyZQogICAg IHJldHVybiBpZDsKIH0KIAotdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6cmVtb3ZlQnJlYWtwb2lu dChCcmVha3BvaW50SUQgaWQpCit2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpyZW1vdmVCcmVha3Bv aW50KEpTQzo6QnJlYWtwb2ludElEIGlkKQogewotICAgIEFTU0VSVChpZCAhPSBub0JyZWFrcG9p bnRJRCk7CisgICAgQVNTRVJUKGlkICE9IEpTQzo6bm9CcmVha3BvaW50SUQpOwogICAgIEJyZWFr cG9pbnRJRFRvQWN0aW9uc01hcDo6aXRlcmF0b3IgaXQgPSBtX2JyZWFrcG9pbnRJRFRvQWN0aW9u cy5maW5kKGlkKTsKICAgICBpZiAoaXQgIT0gbV9icmVha3BvaW50SURUb0FjdGlvbnMuZW5kKCkp CiAgICAgICAgIG1fYnJlYWtwb2ludElEVG9BY3Rpb25zLnJlbW92ZShpdCk7CkBAIC0xNjksNyAr MTY5LDcgQEAgdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlzcGF0Y2hEaWRDb250aW51ZShTY3Jp cHREZWJ1Z0xpc3RlbmVyKiBsaXN0ZW5lcikKIAogdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlz cGF0Y2hEaWRQYXJzZVNvdXJjZShjb25zdCBMaXN0ZW5lclNldCYgbGlzdGVuZXJzLCBTb3VyY2VQ cm92aWRlciogc291cmNlUHJvdmlkZXIsIGJvb2wgaXNDb250ZW50U2NyaXB0KQogewotICAgIFNv dXJjZUlEIHNvdXJjZUlEID0gc291cmNlUHJvdmlkZXItPmFzSUQoKTsKKyAgICBKU0M6OlNvdXJj ZUlEIHNvdXJjZUlEID0gc291cmNlUHJvdmlkZXItPmFzSUQoKTsKIAogICAgIFNjcmlwdERlYnVn TGlzdGVuZXI6OlNjcmlwdCBzY3JpcHQ7CiAgICAgc2NyaXB0LnVybCA9IHNvdXJjZVByb3ZpZGVy LT51cmwoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdERl YnVnU2VydmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHREZWJ1Z1NlcnZl ci5oCmluZGV4IGE3MDE4YzguLjE4ZmI5NDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvU2NyaXB0RGVidWdTZXJ2ZXIuaApAQCAtMzIsMTAgKzMyLDggQEAKIAogI2lmIEVOQUJM RShKQVZBU0NSSVBUX0RFQlVHR0VSKQogCi0jaW5jbHVkZSAiQnJlYWtwb2ludElELmgiCiAjaW5j bHVkZSAiU2NyaXB0QnJlYWtwb2ludC5oIgogI2luY2x1ZGUgIlNjcmlwdERlYnVnTGlzdGVuZXIu aCIKLSNpbmNsdWRlICJTb3VyY2VJRC5oIgogI2luY2x1ZGUgIlRpbWVyLmgiCiAjaW5jbHVkZSA8 YmluZGluZ3MvU2NyaXB0T2JqZWN0Lmg+CiAjaW5jbHVkZSA8ZGVidWdnZXIvRGVidWdnZXIuaD4K QEAgLTU3LDggKzU1LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgU2NyaXB0RGVidWdT ZXJ2ZXIgOiBwdWJsaWMgSlNDOjpEZWJ1Z2dlciB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUo U2NyaXB0RGVidWdTZXJ2ZXIpOyBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKLSAg ICBCcmVha3BvaW50SUQgc2V0QnJlYWtwb2ludChTb3VyY2VJRCwgY29uc3QgU2NyaXB0QnJlYWtw b2ludCYsIHVuc2lnbmVkKiBhY3R1YWxMaW5lTnVtYmVyLCB1bnNpZ25lZCogYWN0dWFsQ29sdW1u TnVtYmVyKTsKLSAgICB2b2lkIHJlbW92ZUJyZWFrcG9pbnQoQnJlYWtwb2ludElEKTsKKyAgICBK U0M6OkJyZWFrcG9pbnRJRCBzZXRCcmVha3BvaW50KEpTQzo6U291cmNlSUQsIGNvbnN0IFNjcmlw dEJyZWFrcG9pbnQmLCB1bnNpZ25lZCogYWN0dWFsTGluZU51bWJlciwgdW5zaWduZWQqIGFjdHVh bENvbHVtbk51bWJlcik7CisgICAgdm9pZCByZW1vdmVCcmVha3BvaW50KEpTQzo6QnJlYWtwb2lu dElEKTsKICAgICB2b2lkIGNsZWFyQnJlYWtwb2ludHMoKTsKIAogICAgIGJvb2wgY2FuU2V0U2Ny aXB0U291cmNlKCk7CkBAIC0xMTksNyArMTE3LDcgQEAgcHJvdGVjdGVkOgogCiBwcml2YXRlOgog ICAgIHR5cGVkZWYgVmVjdG9yPFNjcmlwdEJyZWFrcG9pbnRBY3Rpb24+IEJyZWFrcG9pbnRBY3Rp b25zOwotICAgIHR5cGVkZWYgSGFzaE1hcDxCcmVha3BvaW50SUQsIEJyZWFrcG9pbnRBY3Rpb25z PiBCcmVha3BvaW50SURUb0FjdGlvbnNNYXA7CisgICAgdHlwZWRlZiBIYXNoTWFwPEpTQzo6QnJl YWtwb2ludElELCBCcmVha3BvaW50QWN0aW9ucz4gQnJlYWtwb2ludElEVG9BY3Rpb25zTWFwOwog CiAgICAgdmlydHVhbCBib29sIG5lZWRQYXVzZUhhbmRsaW5nKEpTQzo6SlNHbG9iYWxPYmplY3Qq KSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlQnJlYWtwb2ludEhpdChjb25zdCBK U0M6OkJyZWFrcG9pbnQmKSBPVkVSUklERTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL2pzL1NvdXJjZUlELmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9Tb3VyY2VJ RC5oCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAzNjdhMTE0Li4wMDAwMDAwCi0tLSBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NvdXJjZUlELmgKKysrIC9kZXYvbnVsbApAQCAt MSw0MiArMCwwIEBACi0vKgotICogQ29weXJpZ2h0IChDKSAyMDEzIEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KLSAqCi0gKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBh bmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlvbiwgYXJlIHBl cm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwotICogYXJlIG1l dDoKLSAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUg YWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCi0gKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmlu YXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGlu IHRoZQotICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVk IHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KLSAqCi0gKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVE IEJZIEFQUExFIElOQy4gYGBBUyBJUycnIEFORCBBTlkKLSAqIEVYUFJFU1MgT1IgSU1QTElFRCBX QVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCi0gKiBJTVBMSUVE IFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VM QVIKLSAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJ TkMuIE9SCi0gKiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVD VCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKLSAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBE QU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKLSAqIFBST0NVUkVNRU5UIE9G IFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUgotICog UFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04g QU5ZIFRIRU9SWQotICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1Qg TElBQklMSVRZLCBPUiBUT1JUCi0gKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNF KSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKLSAqIE9GIFRISVMgU09GVFdBUkUs IEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuIAotICov Ci0KLSNpZm5kZWYgU291cmNlSURfaAotI2RlZmluZSBTb3VyY2VJRF9oCi0KLSNpZiBFTkFCTEUo SkFWQVNDUklQVF9ERUJVR0dFUikKLQotI2luY2x1ZGUgPGRlYnVnZ2VyL0RlYnVnZ2VyLmg+Ci0K LW5hbWVzcGFjZSBXZWJDb3JlIHsKLQotdHlwZWRlZiBKU0M6OlNvdXJjZUlEIFNvdXJjZUlEOwot c3RhdGljIGNvbnN0IFNvdXJjZUlEIG5vU291cmNlSUQgPSBKU0M6Om5vU291cmNlSUQ7Ci0KLX0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKLQotI2VuZGlmIC8vIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVH R0VSKQotCi0jZW5kaWYgLy8gU291cmNlSURfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCmluZGV4IGU1M2UzYjIuLmQxNzJkM2Mg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFn ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJB Z2VudC5jcHAKQEAgLTYwLDcgKzYwLDcgQEAgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6SW5zcGVj dG9yRGVidWdnZXJBZ2VudChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW4KICAgICA6 IEluc3BlY3RvckFnZW50QmFzZShBU0NJSUxpdGVyYWwoIkRlYnVnZ2VyIiksIGluc3RydW1lbnRp bmdBZ2VudHMpCiAgICAgLCBtX2luamVjdGVkU2NyaXB0TWFuYWdlcihpbmplY3RlZFNjcmlwdE1h bmFnZXIpCiAgICAgLCBtX3BhdXNlZFNjcmlwdFN0YXRlKDApCi0gICAgLCBtX2NvbnRpbnVlVG9M b2NhdGlvbkJyZWFrcG9pbnRJRChub0JyZWFrcG9pbnRJRCkKKyAgICAsIG1fY29udGludWVUb0xv Y2F0aW9uQnJlYWtwb2ludElEKEpTQzo6bm9CcmVha3BvaW50SUQpCiAgICAgLCBtX2VuYWJsZWQo ZmFsc2UpCiAgICAgLCBtX2phdmFTY3JpcHRQYXVzZVNjaGVkdWxlZChmYWxzZSkKICAgICAsIG1f bGlzdGVuZXIoMCkKQEAgLTMwMywxMiArMzAzLDEyIEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJB Z2VudDo6c2V0QnJlYWtwb2ludEJ5VXJsKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgaW50IGxp CiAgICAgKm91dEJyZWFrcG9pbnRJZGVudGlmaWVyID0gYnJlYWtwb2ludElkZW50aWZpZXI7CiB9 CiAKLXN0YXRpYyBib29sIHBhcnNlTG9jYXRpb24oRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBJ bnNwZWN0b3JPYmplY3QqIGxvY2F0aW9uLCBTb3VyY2VJRCogc291cmNlSUQsIHVuc2lnbmVkKiBs aW5lTnVtYmVyLCB1bnNpZ25lZCogY29sdW1uTnVtYmVyKQorc3RhdGljIGJvb2wgcGFyc2VMb2Nh dGlvbihFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIEluc3BlY3Rvck9iamVjdCogbG9jYXRpb24s IEpTQzo6U291cmNlSUQqIHNvdXJjZUlELCB1bnNpZ25lZCogbGluZU51bWJlciwgdW5zaWduZWQq IGNvbHVtbk51bWJlcikKIHsKICAgICBTdHJpbmcgc2NyaXB0SURTdHI7CiAgICAgaWYgKCFsb2Nh dGlvbi0+Z2V0U3RyaW5nKCJzY3JpcHRJZCIsICZzY3JpcHRJRFN0cikgfHwgIWxvY2F0aW9uLT5n ZXROdW1iZXIoImxpbmVOdW1iZXIiLCBsaW5lTnVtYmVyKSkgewogICAgICAgICAvLyBGSVhNRTog cmVwbGFjZSB3aXRoIGlucHV0IHZhbGlkYXRpb24uCi0gICAgICAgICpzb3VyY2VJRCA9IG5vU291 cmNlSUQ7CisgICAgICAgICpzb3VyY2VJRCA9IEpTQzo6bm9Tb3VyY2VJRDsKICAgICAgICAgKmVy cm9yU3RyaW5nID0gInNjcmlwdElkIGFuZCBsaW5lTnVtYmVyIGFyZSByZXF1aXJlZC4iOwogICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQpAQCAtMzIwLDcgKzMyMCw3IEBAIHN0YXRpYyBib29s IHBhcnNlTG9jYXRpb24oRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBJbnNwZWN0b3JPYmplY3Qq IGxvY2F0aW9uLCBTCiAKIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6c2V0QnJlYWtwb2lu dChFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGNvbnN0IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+ JiBsb2NhdGlvbiwgY29uc3QgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4qIG9wdGlvbnMsIEluc3Bl Y3Rvcjo6VHlwZUJ1aWxkZXI6OkRlYnVnZ2VyOjpCcmVha3BvaW50SWQqIG91dEJyZWFrcG9pbnRJ ZGVudGlmaWVyLCBSZWZQdHI8SW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6RGVidWdnZXI6OkxvY2F0 aW9uPiYgYWN0dWFsTG9jYXRpb24pCiB7Ci0gICAgU291cmNlSUQgc291cmNlSUQ7CisgICAgSlND OjpTb3VyY2VJRCBzb3VyY2VJRDsKICAgICB1bnNpZ25lZCBsaW5lTnVtYmVyOwogICAgIHVuc2ln bmVkIGNvbHVtbk51bWJlcjsKIApAQCAtMzY4LDEyICszNjgsMTIgQEAgdm9pZCBJbnNwZWN0b3JE ZWJ1Z2dlckFnZW50OjpyZW1vdmVCcmVha3BvaW50KEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5n JiBicmVha3AKIAogdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50Ojpjb250aW51ZVRvTG9jYXRp b24oRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBjb25zdCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0 PiYgbG9jYXRpb24pCiB7Ci0gICAgaWYgKG1fY29udGludWVUb0xvY2F0aW9uQnJlYWtwb2ludElE ICE9IG5vQnJlYWtwb2ludElEKSB7CisgICAgaWYgKG1fY29udGludWVUb0xvY2F0aW9uQnJlYWtw b2ludElEICE9IEpTQzo6bm9CcmVha3BvaW50SUQpIHsKICAgICAgICAgc2NyaXB0RGVidWdTZXJ2 ZXIoKS5yZW1vdmVCcmVha3BvaW50KG1fY29udGludWVUb0xvY2F0aW9uQnJlYWtwb2ludElEKTsK LSAgICAgICAgbV9jb250aW51ZVRvTG9jYXRpb25CcmVha3BvaW50SUQgPSBub0JyZWFrcG9pbnRJ RDsKKyAgICAgICAgbV9jb250aW51ZVRvTG9jYXRpb25CcmVha3BvaW50SUQgPSBKU0M6Om5vQnJl YWtwb2ludElEOwogICAgIH0KIAotICAgIFNvdXJjZUlEIHNvdXJjZUlEOworICAgIEpTQzo6U291 cmNlSUQgc291cmNlSUQ7CiAgICAgdW5zaWduZWQgbGluZU51bWJlcjsKICAgICB1bnNpZ25lZCBj b2x1bW5OdW1iZXI7CiAKQEAgLTM4NSw3ICszODUsNyBAQCB2b2lkIEluc3BlY3RvckRlYnVnZ2Vy QWdlbnQ6OmNvbnRpbnVlVG9Mb2NhdGlvbihFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGNvbnN0 CiAgICAgcmVzdW1lKGVycm9yU3RyaW5nKTsKIH0KIAotUGFzc1JlZlB0cjxJbnNwZWN0b3I6OlR5 cGVCdWlsZGVyOjpEZWJ1Z2dlcjo6TG9jYXRpb24+IEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnJl c29sdmVCcmVha3BvaW50KGNvbnN0IFN0cmluZyYgYnJlYWtwb2ludElkZW50aWZpZXIsIFNvdXJj ZUlEIHNvdXJjZUlELCBjb25zdCBTY3JpcHRCcmVha3BvaW50JiBicmVha3BvaW50KQorUGFzc1Jl ZlB0cjxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpEZWJ1Z2dlcjo6TG9jYXRpb24+IEluc3BlY3Rv ckRlYnVnZ2VyQWdlbnQ6OnJlc29sdmVCcmVha3BvaW50KGNvbnN0IFN0cmluZyYgYnJlYWtwb2lu dElkZW50aWZpZXIsIEpTQzo6U291cmNlSUQgc291cmNlSUQsIGNvbnN0IFNjcmlwdEJyZWFrcG9p bnQmIGJyZWFrcG9pbnQpCiB7CiAgICAgU2NyaXB0c01hcDo6aXRlcmF0b3Igc2NyaXB0SXRlcmF0 b3IgPSBtX3NjcmlwdHMuZmluZChzb3VyY2VJRCk7CiAgICAgaWYgKHNjcmlwdEl0ZXJhdG9yID09 IG1fc2NyaXB0cy5lbmQoKSkKQEAgLTM5NiwxMyArMzk2LDEzIEBAIFBhc3NSZWZQdHI8SW5zcGVj dG9yOjpUeXBlQnVpbGRlcjo6RGVidWdnZXI6OkxvY2F0aW9uPiBJbnNwZWN0b3JEZWJ1Z2dlckFn ZW50OjpyCiAKICAgICB1bnNpZ25lZCBhY3R1YWxMaW5lTnVtYmVyOwogICAgIHVuc2lnbmVkIGFj dHVhbENvbHVtbk51bWJlcjsKLSAgICBCcmVha3BvaW50SUQgZGVidWdTZXJ2ZXJCcmVha3BvaW50 SUQgPSBzY3JpcHREZWJ1Z1NlcnZlcigpLnNldEJyZWFrcG9pbnQoc291cmNlSUQsIGJyZWFrcG9p bnQsICZhY3R1YWxMaW5lTnVtYmVyLCAmYWN0dWFsQ29sdW1uTnVtYmVyKTsKLSAgICBpZiAoZGVi dWdTZXJ2ZXJCcmVha3BvaW50SUQgPT0gbm9CcmVha3BvaW50SUQpCisgICAgSlNDOjpCcmVha3Bv aW50SUQgZGVidWdTZXJ2ZXJCcmVha3BvaW50SUQgPSBzY3JpcHREZWJ1Z1NlcnZlcigpLnNldEJy ZWFrcG9pbnQoc291cmNlSUQsIGJyZWFrcG9pbnQsICZhY3R1YWxMaW5lTnVtYmVyLCAmYWN0dWFs Q29sdW1uTnVtYmVyKTsKKyAgICBpZiAoZGVidWdTZXJ2ZXJCcmVha3BvaW50SUQgPT0gSlNDOjpu b0JyZWFrcG9pbnRJRCkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBCcmVha3BvaW50SWRlbnRp ZmllclRvRGVidWdTZXJ2ZXJCcmVha3BvaW50SURzTWFwOjppdGVyYXRvciBkZWJ1Z1NlcnZlckJy ZWFrcG9pbnRJRHNJdGVyYXRvciA9IG1fYnJlYWtwb2ludElkZW50aWZpZXJUb0RlYnVnU2VydmVy QnJlYWtwb2ludElEcy5maW5kKGJyZWFrcG9pbnRJZGVudGlmaWVyKTsKICAgICBpZiAoZGVidWdT ZXJ2ZXJCcmVha3BvaW50SURzSXRlcmF0b3IgPT0gbV9icmVha3BvaW50SWRlbnRpZmllclRvRGVi dWdTZXJ2ZXJCcmVha3BvaW50SURzLmVuZCgpKQotICAgICAgICBkZWJ1Z1NlcnZlckJyZWFrcG9p bnRJRHNJdGVyYXRvciA9IG1fYnJlYWtwb2ludElkZW50aWZpZXJUb0RlYnVnU2VydmVyQnJlYWtw b2ludElEcy5zZXQoYnJlYWtwb2ludElkZW50aWZpZXIsIFZlY3RvcjxCcmVha3BvaW50SUQ+KCkp Lml0ZXJhdG9yOworICAgICAgICBkZWJ1Z1NlcnZlckJyZWFrcG9pbnRJRHNJdGVyYXRvciA9IG1f YnJlYWtwb2ludElkZW50aWZpZXJUb0RlYnVnU2VydmVyQnJlYWtwb2ludElEcy5zZXQoYnJlYWtw b2ludElkZW50aWZpZXIsIFZlY3RvcjxKU0M6OkJyZWFrcG9pbnRJRD4oKSkuaXRlcmF0b3I7CiAg ICAgZGVidWdTZXJ2ZXJCcmVha3BvaW50SURzSXRlcmF0b3ItPnZhbHVlLmFwcGVuZChkZWJ1Z1Nl cnZlckJyZWFrcG9pbnRJRCk7CiAKICAgICBSZWZQdHI8SW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6 RGVidWdnZXI6OkxvY2F0aW9uPiBsb2NhdGlvbiA9IEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OkRl YnVnZ2VyOjpMb2NhdGlvbjo6Y3JlYXRlKCkKQEAgLTQyNyw3ICs0MjcsNyBAQCB2b2lkIEluc3Bl Y3RvckRlYnVnZ2VyQWdlbnQ6OnNlYXJjaEluQ29udGVudChFcnJvclN0cmluZyogZXJyb3IsIGNv bnN0IFN0cmluZyYgcwogICAgIGJvb2wgaXNSZWdleCA9IG9wdGlvbmFsSXNSZWdleCA/ICpvcHRp b25hbElzUmVnZXggOiBmYWxzZTsKICAgICBib29sIGNhc2VTZW5zaXRpdmUgPSBvcHRpb25hbENh c2VTZW5zaXRpdmUgPyAqb3B0aW9uYWxDYXNlU2Vuc2l0aXZlIDogZmFsc2U7CiAKLSAgICBTb3Vy Y2VJRCBzb3VyY2VJRCA9IHNjcmlwdElEU3RyLnRvSW50UHRyKCk7CisgICAgSlNDOjpTb3VyY2VJ RCBzb3VyY2VJRCA9IHNjcmlwdElEU3RyLnRvSW50UHRyKCk7CiAgICAgU2NyaXB0c01hcDo6aXRl cmF0b3IgaXQgPSBtX3NjcmlwdHMuZmluZChzb3VyY2VJRCk7CiAgICAgaWYgKGl0ICE9IG1fc2Ny aXB0cy5lbmQoKSkKICAgICAgICAgcmVzdWx0cyA9IENvbnRlbnRTZWFyY2hVdGlsczo6c2VhcmNo SW5UZXh0QnlMaW5lcyhpdC0+dmFsdWUuc291cmNlLCBxdWVyeSwgY2FzZVNlbnNpdGl2ZSwgaXNS ZWdleCk7CkBAIC00NDksNyArNDQ5LDcgQEAgdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50Ojpz ZXRTY3JpcHRTb3VyY2UoRXJyb3JTdHJpbmcqIGVycm9yLCBjb25zdCBTdHJpbmcmIHMKIAogdm9p ZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpnZXRTY3JpcHRTb3VyY2UoRXJyb3JTdHJpbmcqIGVy cm9yLCBjb25zdCBTdHJpbmcmIHNjcmlwdElEU3RyLCBTdHJpbmcqIHNjcmlwdFNvdXJjZSkKIHsK LSAgICBTb3VyY2VJRCBzb3VyY2VJRCA9IHNjcmlwdElEU3RyLnRvSW50UHRyKCk7CisgICAgSlND OjpTb3VyY2VJRCBzb3VyY2VJRCA9IHNjcmlwdElEU3RyLnRvSW50UHRyKCk7CiAgICAgU2NyaXB0 c01hcDo6aXRlcmF0b3IgaXQgPSBtX3NjcmlwdHMuZmluZChzb3VyY2VJRCk7CiAgICAgaWYgKGl0 ICE9IG1fc2NyaXB0cy5lbmQoKSkKICAgICAgICAgKnNjcmlwdFNvdXJjZSA9IGl0LT52YWx1ZS5z b3VyY2U7CkBAIC02NzcsNyArNjc3LDcgQEAgU3RyaW5nIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6 OnNvdXJjZU1hcFVSTEZvclNjcmlwdChjb25zdCBTY3JpcHQmIHNjcmlwdCkKIAogLy8gSmF2YVNj cmlwdERlYnVnTGlzdGVuZXIgZnVuY3Rpb25zCiAKLXZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2Vu dDo6ZGlkUGFyc2VTb3VyY2UoU291cmNlSUQgc291cmNlSUQsIGNvbnN0IFNjcmlwdCYgaW5TY3Jp cHQpCit2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRpZFBhcnNlU291cmNlKEpTQzo6U291 cmNlSUQgc291cmNlSUQsIGNvbnN0IFNjcmlwdCYgaW5TY3JpcHQpCiB7CiAgICAgU2NyaXB0IHNj cmlwdCA9IGluU2NyaXB0OwogICAgIGlmICghc2NyaXB0LnN0YXJ0TGluZSAmJiAhc2NyaXB0LnN0 YXJ0Q29sdW1uKQpAQCAtNzQ2LDkgKzc0Niw5IEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2Vu dDo6ZGlkUGF1c2UoSlNDOjpFeGVjU3RhdGUqIHNjcmlwdFN0YXRlLCBjb25zdCBEZXByZWNhCiAg ICAgbV9mcm9udGVuZERpc3BhdGNoZXItPnBhdXNlZChjdXJyZW50Q2FsbEZyYW1lcygpLCBtX2Jy ZWFrUmVhc29uLCBtX2JyZWFrQXV4RGF0YSk7CiAgICAgbV9qYXZhU2NyaXB0UGF1c2VTY2hlZHVs ZWQgPSBmYWxzZTsKIAotICAgIGlmIChtX2NvbnRpbnVlVG9Mb2NhdGlvbkJyZWFrcG9pbnRJRCAh PSBub0JyZWFrcG9pbnRJRCkgeworICAgIGlmIChtX2NvbnRpbnVlVG9Mb2NhdGlvbkJyZWFrcG9p bnRJRCAhPSBKU0M6Om5vQnJlYWtwb2ludElEKSB7CiAgICAgICAgIHNjcmlwdERlYnVnU2VydmVy KCkucmVtb3ZlQnJlYWtwb2ludChtX2NvbnRpbnVlVG9Mb2NhdGlvbkJyZWFrcG9pbnRJRCk7Ci0g ICAgICAgIG1fY29udGludWVUb0xvY2F0aW9uQnJlYWtwb2ludElEID0gbm9CcmVha3BvaW50SUQ7 CisgICAgICAgIG1fY29udGludWVUb0xvY2F0aW9uQnJlYWtwb2ludElEID0gSlNDOjpub0JyZWFr cG9pbnRJRDsKICAgICB9CiAgICAgaWYgKG1fbGlzdGVuZXIpCiAgICAgICAgIG1fbGlzdGVuZXIt PmRpZFBhdXNlKCk7CkBAIC03NzUsNyArNzc1LDcgQEAgdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFn ZW50OjpjbGVhcigpCiAgICAgbV9jdXJyZW50Q2FsbFN0YWNrID0gRGVwcmVjYXRlZDo6U2NyaXB0 VmFsdWUoKTsKICAgICBtX3NjcmlwdHMuY2xlYXIoKTsKICAgICBtX2JyZWFrcG9pbnRJZGVudGlm aWVyVG9EZWJ1Z1NlcnZlckJyZWFrcG9pbnRJRHMuY2xlYXIoKTsKLSAgICBtX2NvbnRpbnVlVG9M b2NhdGlvbkJyZWFrcG9pbnRJRCA9IG5vQnJlYWtwb2ludElEOworICAgIG1fY29udGludWVUb0xv Y2F0aW9uQnJlYWtwb2ludElEID0gSlNDOjpub0JyZWFrcG9pbnRJRDsKICAgICBjbGVhckJyZWFr RGV0YWlscygpOwogICAgIG1famF2YVNjcmlwdFBhdXNlU2NoZWR1bGVkID0gZmFsc2U7CiAgICAg RXJyb3JTdHJpbmcgZXJyb3I7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckRlYnVnZ2VyQWdlbnQuaAppbmRleCBkOTY1MjQ1Li5jYmJmZDE1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKQEAgLTMyLDE1 ICszMiwxMyBAQAogCiAjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpICYmIEVOQUJMRShJ TlNQRUNUT1IpCiAKLSNpbmNsdWRlICJCcmVha3BvaW50SUQuaCIKICNpbmNsdWRlICJDb25zb2xl QVBJVHlwZXMuaCIKICNpbmNsdWRlICJDb25zb2xlVHlwZXMuaCIKICNpbmNsdWRlICJJbmplY3Rl ZFNjcmlwdC5oIgogI2luY2x1ZGUgIkluc3BlY3RvcldlYkFnZW50QmFzZS5oIgogI2luY2x1ZGUg IlNjcmlwdEJyZWFrcG9pbnQuaCIKICNpbmNsdWRlICJTY3JpcHREZWJ1Z0xpc3RlbmVyLmgiCi0j aW5jbHVkZSAiU2NyaXB0U3RhdGUuaCIKLSNpbmNsdWRlICJTb3VyY2VJRC5oIgorI2luY2x1ZGUg PGRlYnVnZ2VyL0RlYnVnZ2VyLmg+CiAjaW5jbHVkZSA8aW5zcGVjdG9yL0luc3BlY3RvckpTQmFj a2VuZERpc3BhdGNoZXJzLmg+CiAjaW5jbHVkZSA8aW5zcGVjdG9yL0luc3BlY3RvckpTRnJvbnRl bmREaXNwYXRjaGVycy5oPgogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CkBAIC0xNTgsMjAgKzE1 NiwyMCBAQCBwcml2YXRlOgogCiAgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3I6OlR5cGVCdWlsZGVy OjpBcnJheTxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpEZWJ1Z2dlcjo6Q2FsbEZyYW1lPj4gY3Vy cmVudENhbGxGcmFtZXMoKTsKIAotICAgIHZpcnR1YWwgdm9pZCBkaWRQYXJzZVNvdXJjZShTb3Vy Y2VJRCwgY29uc3QgU2NyaXB0JikgT1ZFUlJJREUgRklOQUw7CisgICAgdmlydHVhbCB2b2lkIGRp ZFBhcnNlU291cmNlKEpTQzo6U291cmNlSUQsIGNvbnN0IFNjcmlwdCYpIE9WRVJSSURFIEZJTkFM OwogICAgIHZpcnR1YWwgdm9pZCBmYWlsZWRUb1BhcnNlU291cmNlKGNvbnN0IFN0cmluZyYgdXJs LCBjb25zdCBTdHJpbmcmIGRhdGEsIGludCBmaXJzdExpbmUsIGludCBlcnJvckxpbmUsIGNvbnN0 IFN0cmluZyYgZXJyb3JNZXNzYWdlKSBPVkVSUklERSBGSU5BTDsKIAogICAgIHZvaWQgc2V0UGF1 c2VPbkV4Y2VwdGlvbnNJbXBsKEVycm9yU3RyaW5nKiwgaW50KTsKIAotICAgIFBhc3NSZWZQdHI8 SW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6RGVidWdnZXI6OkxvY2F0aW9uPiByZXNvbHZlQnJlYWtw b2ludChjb25zdCBTdHJpbmcmIGJyZWFrcG9pbnRJZGVudGlmaWVyLCBTb3VyY2VJRCwgY29uc3Qg U2NyaXB0QnJlYWtwb2ludCYpOworICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9yOjpUeXBlQnVpbGRl cjo6RGVidWdnZXI6OkxvY2F0aW9uPiByZXNvbHZlQnJlYWtwb2ludChjb25zdCBTdHJpbmcmIGJy ZWFrcG9pbnRJZGVudGlmaWVyLCBKU0M6OlNvdXJjZUlELCBjb25zdCBTY3JpcHRCcmVha3BvaW50 Jik7CiAgICAgdm9pZCBjbGVhcigpOwogICAgIGJvb2wgYXNzZXJ0UGF1c2VkKEVycm9yU3RyaW5n Kik7CiAgICAgdm9pZCBjbGVhckJyZWFrRGV0YWlscygpOwogCiAgICAgU3RyaW5nIHNvdXJjZU1h cFVSTEZvclNjcmlwdChjb25zdCBTY3JpcHQmKTsKIAotICAgIHR5cGVkZWYgSGFzaE1hcDxTb3Vy Y2VJRCwgU2NyaXB0PiBTY3JpcHRzTWFwOwotICAgIHR5cGVkZWYgSGFzaE1hcDxTdHJpbmcsIFZl Y3RvcjxCcmVha3BvaW50SUQ+PiBCcmVha3BvaW50SWRlbnRpZmllclRvRGVidWdTZXJ2ZXJCcmVh a3BvaW50SURzTWFwOworICAgIHR5cGVkZWYgSGFzaE1hcDxKU0M6OlNvdXJjZUlELCBTY3JpcHQ+ IFNjcmlwdHNNYXA7CisgICAgdHlwZWRlZiBIYXNoTWFwPFN0cmluZywgVmVjdG9yPEpTQzo6QnJl YWtwb2ludElEPj4gQnJlYWtwb2ludElkZW50aWZpZXJUb0RlYnVnU2VydmVyQnJlYWtwb2ludElE c01hcDsKICAgICB0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCBSZWZQdHI8SW5zcGVjdG9yOjpJbnNw ZWN0b3JPYmplY3Q+PiBCcmVha3BvaW50SWRlbnRpZmllclRvQnJlYWtwb2ludE1hcDsKIAogICAg IEluamVjdGVkU2NyaXB0TWFuYWdlciogbV9pbmplY3RlZFNjcmlwdE1hbmFnZXI7CkBAIC0xODIs NyArMTgwLDcgQEAgcHJpdmF0ZToKICAgICBTY3JpcHRzTWFwIG1fc2NyaXB0czsKICAgICBCcmVh a3BvaW50SWRlbnRpZmllclRvRGVidWdTZXJ2ZXJCcmVha3BvaW50SURzTWFwIG1fYnJlYWtwb2lu dElkZW50aWZpZXJUb0RlYnVnU2VydmVyQnJlYWtwb2ludElEczsKICAgICBCcmVha3BvaW50SWRl bnRpZmllclRvQnJlYWtwb2ludE1hcCBtX2phdmFTY3JpcHRCcmVha3BvaW50czsKLSAgICBCcmVh a3BvaW50SUQgbV9jb250aW51ZVRvTG9jYXRpb25CcmVha3BvaW50SUQ7CisgICAgSlNDOjpCcmVh a3BvaW50SUQgbV9jb250aW51ZVRvTG9jYXRpb25CcmVha3BvaW50SUQ7CiAgICAgSW5zcGVjdG9y OjpJbnNwZWN0b3JEZWJ1Z2dlckZyb250ZW5kRGlzcGF0Y2hlcjo6UmVhc29uOjpFbnVtIG1fYnJl YWtSZWFzb247CiAgICAgUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiBtX2JyZWFr QXV4RGF0YTsKICAgICBib29sIG1fZW5hYmxlZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9TY3JpcHREZWJ1Z0xpc3RlbmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvU2NyaXB0RGVidWdMaXN0ZW5lci5oCmluZGV4IDBlYjRmYjMuLjBmNDkzMjggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9TY3JpcHREZWJ1Z0xpc3RlbmVyLmgKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnTGlzdGVuZXIuaApAQCAtMzIsOCAr MzIsNyBAQAogCiAjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCiAKLSNpbmNsdWRlICJT Y3JpcHRTdGF0ZS5oIgotI2luY2x1ZGUgIlNvdXJjZUlELmgiCisjaW5jbHVkZSA8ZGVidWdnZXIv RGVidWdnZXIuaD4KICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0 L1dURlN0cmluZy5oPgogCkBAIC02OSw3ICs2OCw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwg flNjcmlwdERlYnVnTGlzdGVuZXIoKSB7IH0KIAotICAgIHZpcnR1YWwgdm9pZCBkaWRQYXJzZVNv dXJjZShTb3VyY2VJRCwgY29uc3QgU2NyaXB0JikgPSAwOworICAgIHZpcnR1YWwgdm9pZCBkaWRQ YXJzZVNvdXJjZShKU0M6OlNvdXJjZUlELCBjb25zdCBTY3JpcHQmKSA9IDA7CiAgICAgdmlydHVh bCB2b2lkIGZhaWxlZFRvUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmlu ZyYgZGF0YSwgaW50IGZpcnN0TGluZSwgaW50IGVycm9yTGluZSwgY29uc3QgU3RyaW5nJiBlcnJv ck1lc3NhZ2UpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlkUGF1c2UoSlNDOjpFeGVjU3RhdGUq LCBjb25zdCBEZXByZWNhdGVkOjpTY3JpcHRWYWx1ZSYgY2FsbEZyYW1lcywgY29uc3QgRGVwcmVj YXRlZDo6U2NyaXB0VmFsdWUmIGV4Y2VwdGlvbikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaWRD b250aW51ZSgpID0gMDsK