111946 2013-03-10 14:54:14 -0700 XSSAuditor doesn't need a copy of the original document's body. 2013-03-11 02:50:29 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 110733 1 mkwst mkwst abarth dbates esprehn+autocc ojan.autocc tsepez webkit.review.bot oldest_to_newest 851980 0 mkwst 2013-03-10 14:54:14 -0700 XSSAuditor doesn't need a copy of the original document's body. 851981 1 192387 mkwst 2013-03-10 15:09:12 -0700 Created attachment 192387 Patch 852006 2 192387 darin 2013-03-10 17:33:40 -0700 Comment on attachment 192387 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=192387&action=review > Source/WebCore/html/parser/XSSAuditor.cpp:336 > + if (!m_reportURL.isEmpty()) > m_reportURL = KURL(); This is now a strange sequence. It says “make all URLs null except for the empty URL”; having logic that goes out of its way to preserve the empty URL rather than replacing it with null is strange. I suggest an unconditional assignment without an if statement. > Source/WebCore/html/parser/XSSAuditorDelegate.cpp:83 > + FormData* formData = frameLoader->documentLoader()->originalRequest().httpBody(); > + if (formData) > + httpBody = formData->flattenToString(); It’s sometimes considered good style to write code like this with the assignment in the if statement itself. I like it that way. 852129 3 mkwst 2013-03-11 02:10:00 -0700 Thanks for taking a look! (In reply to comment #2) > (From update of attachment 192387 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=192387&action=review > > > Source/WebCore/html/parser/XSSAuditor.cpp:336 > > + if (!m_reportURL.isEmpty()) > > m_reportURL = KURL(); > > This is now a strange sequence. It says “make all URLs null except for the empty URL”; having logic that goes out of its way to preserve the empty URL rather than replacing it with null is strange. I suggest an unconditional assignment without an if statement. The goal here is to only send one report per page. I think we should actually refactor this into a counter stored on XSSAuditorDelegate now that I look at it: bug 111964. For this patch, I'm happy to just drop the `if`. > > Source/WebCore/html/parser/XSSAuditorDelegate.cpp:83 > > + FormData* formData = frameLoader->documentLoader()->originalRequest().httpBody(); > > + if (formData) > > + httpBody = formData->flattenToString(); > > It’s sometimes considered good style to write code like this with the assignment in the if statement itself. I like it that way. I personally prefer one effect per line when possible, but it's a pretty common pattern in WebCore, so I'm happy to try to start using it. :) 852130 4 192427 mkwst 2013-03-11 02:22:01 -0700 Created attachment 192427 Patch for landing 852139 5 192427 webkit.review.bot 2013-03-11 02:50:25 -0700 Comment on attachment 192427 Patch for landing Clearing flags on attachment: 192427 Committed r145348: <http://trac.webkit.org/changeset/145348> 852140 6 webkit.review.bot 2013-03-11 02:50:29 -0700 All reviewed patches have been landed. Closing bug. 192387 2013-03-10 15:09:12 -0700 2013-03-11 02:21:55 -0700 Patch bug-111946-20130310230450.patch text/plain 8255 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWYzODIxMDBmZmZmYzVl NjVkNmViNDMwNjViYzQ2MmYxYjY2YzZkMi4uNDNiNjk5NGRhOTVlN2M3NzE1OGFiYjJmMzRiMzFm ZTNjY2VjOTlkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDEzLTAzLTEwICBNaWtl IFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgWFNTQXVkaXRvciBkb2Vzbid0 IG5lZWQgYSBjb3B5IG9mIHRoZSBvcmlnaW5hbCBkb2N1bWVudCdzIGJvZHkuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE5NDYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgWFNTQXVkaXRvciBjdXJy ZW50bHkgY29waWVzIHRoZSBvcmlnaW5hbCBIVFRQIGJvZHkgb2YgdGhlIGRvY3VtZW50CisgICAg ICAgIHRoYXQncyBiZWluZyBhdWRpdGVkIGluIG9yZGVyIHRvIGluY2x1ZGUgaXQgaW50byBhIHZp b2xhdGlvbiByZXBvcnQgaWYKKyAgICAgICAgcmVmbGVjdGVkIFhTUyBpcyBkZXRlY3RlZC4gV2Ug ZG9uJ3QgYWN0dWFsbHkgbmVlZCB0byBkbyB0aGlzLCBhcyB3ZQorICAgICAgICBoYXZlIGFjY2Vz cyB0byB0aGUgb3JpZ2luYWwgcmVxdWVzdCBpbmZvcm1hdGlvbiBmcm9tIGluc2lkZSB0aGUKKyAg ICAgICAgWFNTQXVkaXRvckRlbGVnYXRlIHdoZXJlIHRoZSByZXBvcnQgaXMgZ2VuZXJhdGVkLgor ICAgICAgICBYU1NBdWRpdG9yRGVsZWdhdGU6OmRpZEJsb2NrU2NyaXB0IEFTU0VSVHMgdGhhdCBp dCdzIHJ1bm5pbmcgb24gdGhlCisgICAgICAgIG1haW4gdGhyZWFkLCBzbyBpdCBzaG91bGQgYmUg c2FmZSB0byByZWFjaCB0aHJvdWdoIHRoZSBkb2N1bWVudCdzCisgICAgICAgIGxvYWRlciB0byBn ZXQgdGhhdCBpbmZvcm1hdGlvbiBkaXJlY3RseSwgcmF0aGVyIHRoYW4gcGFzc2luZyBpdCBmcm9t CisgICAgICAgIHRocmVhZCB0byB0aHJlYWQgdmlhIFhTU0luZm8gb2JqZWN0IHByb3BlcnRpZXMu CisKKyAgICAgICAgKiBodG1sL3BhcnNlci9YU1NBdWRpdG9yLmg6CisgICAgICAgICogaHRtbC9w YXJzZXIvWFNTQXVkaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpYU1NBdWRpdG9yOjppbml0 KToKKyAgICAgICAgKFdlYkNvcmU6OlhTU0F1ZGl0b3I6OmZpbHRlclRva2VuKToKKyAgICAgICAg KFdlYkNvcmU6OlhTU0F1ZGl0b3I6OmlzU2FmZVRvU2VuZFRvQW5vdGhlclRocmVhZCk6CisgICAg ICAgICogaHRtbC9wYXJzZXIvWFNTQXVkaXRvckRlbGVnYXRlLmg6CisgICAgICAgIChXZWJDb3Jl OjpYU1NJbmZvOjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6WFNTSW5mbzo6WFNTSW5mbyk6 CisgICAgICAgICogaHRtbC9wYXJzZXIvWFNTQXVkaXRvckRlbGVnYXRlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlhTU0luZm86OmlzU2FmZVRvU2VuZFRvQW5vdGhlclRocmVhZCk6CisgICAgICAg ICAgICBEcm9wIHRoZSBYU1NJbmZvIGFuZCBYU1NBdWRpdG9yIHByb3BlcnRpZXMgdGhhdCBoZWxk IGFuCisgICAgICAgICAgICBpc29sYXRlZENvcHkgb2YgdGhlIHRoZSBvcmlnaW5hbCBIVFRQIGJv ZHkuIERlcGVuZGluZyBvbiB0aGUKKyAgICAgICAgICAgIGRvY3VtZW50J3Mgc2l6ZSwgdGhpcyBj b3VsZCBiZSBhIHNpZ25pZmljYW50IHNhdmluZ3MuCisgICAgICAgIChXZWJDb3JlOjpYU1NBdWRp dG9yRGVsZWdhdGU6OmRpZEJsb2NrU2NyaXB0KToKKyAgICAgICAgICAgIFJlYWNoIGludG8gdGhl IGRvY3VtZW50J3MgbG9hZGVyJ3Mgb3JpZ2luYWwgcmVxdWVzdCBpbiBvcmRlciB0bworICAgICAg ICAgICAgZ3JhYiB0aGUgYm9keSBhcyBhIFN0cmluZywgYW5kIGZlZWQgdGhhdCBpbnRvIHRoZSB2 aW9sYXRpb24gcmVwb3J0CisgICAgICAgICAgICBvYmplY3QuCisKKyAgICAgICAgICAgIEFzIGEg ZHJpdmUtYnksIHRoaXMgcGF0Y2ggY3JlYXRlcyBhIEZyYW1lTG9hZGVyKiB0ZW1wb3JhcnkKKyAg ICAgICAgICAgIHZhcmlhYmxlIHRvIG1pbmltaXplIHJlcGV0aXRpb24gaW4gdGhpcyBhcmVhIG9m IHRoZSBjb2RlLiBXZSB1c2UKKyAgICAgICAgICAgIHRoZSBsb2FkZXIgYSBmZXcgdGltZXMsIGJ1 dCBzaG91bGQgb25seSBoYXZlIHRvIGdyYWIgaXQgb25jZS4KKwogMjAxMy0wMy0xMCAgQW5kcmVh cyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgU1ZHRG9jdW1lbnRFeHRlbnNp b25zIHNob3VsZCB1c2UgT3duUHRyIGZvciBwZW5kaW5nIHJlc291cmNlIG1hcHMuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9YU1NBdWRpdG9yLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvcGFyc2VyL1hTU0F1ZGl0b3IuY3BwCmluZGV4IDlmOTNkZWM0YTE1OWUzMjFh NmUyNzlmZjc5ZjJiYTkwMTY4ZmQzY2EuLmYxYWE2OWU1NWY2Y2ZiNzUwODA5NTg2OWQxODFjYTFi M2U1OGI0NjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL1hTU0F1ZGl0 b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL1hTU0F1ZGl0b3IuY3BwCkBA IC0zMTEsOSArMzExLDYgQEAgdm9pZCBYU1NBdWRpdG9yOjppbml0KERvY3VtZW50KiBkb2N1bWVu dCkKICAgICAgICAgbV9pc0VuYWJsZWQgPSBmYWxzZTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K LQotICAgIGlmICghbV9yZXBvcnRVUkwuaXNFbXB0eSgpKQotICAgICAgICBtX29yaWdpbmFsSFRU UEJvZHkgPSBodHRwQm9keUFzU3RyaW5nOwogfQogCiBQYXNzT3duUHRyPFhTU0luZm8+IFhTU0F1 ZGl0b3I6OmZpbHRlclRva2VuKGNvbnN0IEZpbHRlclRva2VuUmVxdWVzdCYgcmVxdWVzdCkKQEAg LTMzNCwxMSArMzMxLDkgQEAgUGFzc093blB0cjxYU1NJbmZvPiBYU1NBdWRpdG9yOjpmaWx0ZXJU b2tlbihjb25zdCBGaWx0ZXJUb2tlblJlcXVlc3QmIHJlcXVlc3QpCiAKICAgICBpZiAoZGlkQmxv Y2tTY3JpcHQpIHsKICAgICAgICAgYm9vbCBkaWRCbG9ja0VudGlyZVBhZ2UgPSAobV94c3NQcm90 ZWN0aW9uID09IENvbnRlbnRTZWN1cml0eVBvbGljeTo6QmxvY2tSZWZsZWN0ZWRYU1MpOwotICAg ICAgICBPd25QdHI8WFNTSW5mbz4geHNzSW5mbyA9IFhTU0luZm86OmNyZWF0ZShtX3JlcG9ydFVS TCwgbV9vcmlnaW5hbEhUVFBCb2R5LCBkaWRCbG9ja0VudGlyZVBhZ2UpOwotICAgICAgICBpZiAo IW1fcmVwb3J0VVJMLmlzRW1wdHkoKSkgeworICAgICAgICBPd25QdHI8WFNTSW5mbz4geHNzSW5m byA9IFhTU0luZm86OmNyZWF0ZShtX3JlcG9ydFVSTCwgZGlkQmxvY2tFbnRpcmVQYWdlKTsKKyAg ICAgICAgaWYgKCFtX3JlcG9ydFVSTC5pc0VtcHR5KCkpCiAgICAgICAgICAgICBtX3JlcG9ydFVS TCA9IEtVUkwoKTsKLSAgICAgICAgICAgIG1fb3JpZ2luYWxIVFRQQm9keSA9IFN0cmluZygpOwot ICAgICAgICB9CiAgICAgICAgIHJldHVybiB4c3NJbmZvLnJlbGVhc2UoKTsKICAgICB9CiAgICAg cmV0dXJuIG51bGxwdHI7CkBAIC03MjcsNyArNzIyLDYgQEAgYm9vbCBYU1NBdWRpdG9yOjppc0xp a2VseVNhZmVSZXNvdXJjZShjb25zdCBTdHJpbmcmIHVybCkKIGJvb2wgWFNTQXVkaXRvcjo6aXNT YWZlVG9TZW5kVG9Bbm90aGVyVGhyZWFkKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9kb2N1bWVu dFVSTC5pc1NhZmVUb1NlbmRUb0Fub3RoZXJUaHJlYWQoKQotICAgICAgICAmJiBtX29yaWdpbmFs SFRUUEJvZHkuaXNTYWZlVG9TZW5kVG9Bbm90aGVyVGhyZWFkKCkKICAgICAgICAgJiYgbV9kZWNv ZGVkVVJMLmlzU2FmZVRvU2VuZFRvQW5vdGhlclRocmVhZCgpCiAgICAgICAgICYmIG1fZGVjb2Rl ZEhUVFBCb2R5LmlzU2FmZVRvU2VuZFRvQW5vdGhlclRocmVhZCgpCiAgICAgICAgICYmIG1fY2Fj aGVkRGVjb2RlZFNuaXBwZXQuaXNTYWZlVG9TZW5kVG9Bbm90aGVyVGhyZWFkKCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL1hTU0F1ZGl0b3IuaCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvcGFyc2VyL1hTU0F1ZGl0b3IuaAppbmRleCBhNjZmNjZlZGI4M2NmMWQ4YjA1MGI3 YjUyYzFjOWQ1ZGNjMjgxMjkwLi43MjMwZGE0MGUwODY3MGUyMDdlZjAwMmExMWJlMmVhZmIxY2E4 MGFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9YU1NBdWRpdG9yLmgK KysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvWFNTQXVkaXRvci5oCkBAIC0xMDUsNyAr MTA1LDYgQEAgcHJpdmF0ZToKICAgICBib29sIG1faXNFbmFibGVkOwogICAgIENvbnRlbnRTZWN1 cml0eVBvbGljeTo6UmVmbGVjdGVkWFNTRGlzcG9zaXRpb24gbV94c3NQcm90ZWN0aW9uOwogCi0g ICAgU3RyaW5nIG1fb3JpZ2luYWxIVFRQQm9keTsKICAgICBTdHJpbmcgbV9kZWNvZGVkVVJMOwog ICAgIFN0cmluZyBtX2RlY29kZWRIVFRQQm9keTsKICAgICBPd25QdHI8U3VmZml4VHJlZTxBU0NJ SUNvZGVib29rPiA+IG1fZGVjb2RlZEhUVFBCb2R5U3VmZml4VHJlZTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL1hTU0F1ZGl0b3JEZWxlZ2F0ZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL3BhcnNlci9YU1NBdWRpdG9yRGVsZWdhdGUuY3BwCmluZGV4IDA2ZjhjNmNm ZWJlMjY4NGJmN2RkMzAyZDk4MDZlYWFjNTUyODE4NDYuLmQxZmZkMTgyZTk3MDljZWJkYzk2ZDAz Njc1ZTExZmNlZTFhOTJiODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2Vy L1hTU0F1ZGl0b3JEZWxlZ2F0ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIv WFNTQXVkaXRvckRlbGVnYXRlLmNwcApAQCAtMjksNiArMjksNyBAQAogI2luY2x1ZGUgIkNvbnNv bGUuaCIKICNpbmNsdWRlICJET01XaW5kb3cuaCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgorI2lu Y2x1ZGUgIkRvY3VtZW50TG9hZGVyLmgiCiAjaW5jbHVkZSAiRm9ybURhdGEuaCIKICNpbmNsdWRl ICJGcmFtZS5oIgogI2luY2x1ZGUgIkZyYW1lTG9hZGVyLmgiCkBAIC00Miw4ICs0Myw3IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogYm9vbCBYU1NJbmZvOjppc1NhZmVUb1NlbmRUb0Fub3RoZXJU aHJlYWQoKSBjb25zdAogewotICAgIHJldHVybiBtX3JlcG9ydFVSTC5pc1NhZmVUb1NlbmRUb0Fu b3RoZXJUaHJlYWQoKQotICAgICAgICAmJiBtX29yaWdpbmFsSFRUUEJvZHkuaXNTYWZlVG9TZW5k VG9Bbm90aGVyVGhyZWFkKCk7CisgICAgcmV0dXJuIG1fcmVwb3J0VVJMLmlzU2FmZVRvU2VuZFRv QW5vdGhlclRocmVhZCgpOwogfQogCiBYU1NBdWRpdG9yRGVsZWdhdGU6OlhTU0F1ZGl0b3JEZWxl Z2F0ZShEb2N1bWVudCogZG9jdW1lbnQpCkBAIC02MiwxOCArNjIsMjcgQEAgdm9pZCBYU1NBdWRp dG9yRGVsZWdhdGU6OmRpZEJsb2NrU2NyaXB0KGNvbnN0IFhTU0luZm8mIHhzc0luZm8pCiAgICAg REVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIGNvbnNvbGVNZXNzYWdlLCAoQVNDSUlMaXRlcmFs KCJSZWZ1c2VkIHRvIGV4ZWN1dGUgYSBKYXZhU2NyaXB0IHNjcmlwdC4gU291cmNlIGNvZGUgb2Yg c2NyaXB0IGZvdW5kIHdpdGhpbiByZXF1ZXN0LlxuIikpKTsKICAgICBtX2RvY3VtZW50LT5hZGRD b25zb2xlTWVzc2FnZShTZWN1cml0eU1lc3NhZ2VTb3VyY2UsIEVycm9yTWVzc2FnZUxldmVsLCBj b25zb2xlTWVzc2FnZSk7CiAKKyAgICBGcmFtZUxvYWRlciogZnJhbWVMb2FkZXIgPSBtX2RvY3Vt ZW50LT5mcmFtZSgpLT5sb2FkZXIoKTsKKwogICAgIGlmICh4c3NJbmZvLm1fZGlkQmxvY2tFbnRp cmVQYWdlKQotICAgICAgICBtX2RvY3VtZW50LT5mcmFtZSgpLT5sb2FkZXIoKS0+c3RvcEFsbExv YWRlcnMoKTsKKyAgICAgICAgZnJhbWVMb2FkZXItPnN0b3BBbGxMb2FkZXJzKCk7CiAKICAgICBp ZiAoIW1fZGlkTm90aWZ5Q2xpZW50KSB7Ci0gICAgICAgIG1fZG9jdW1lbnQtPmZyYW1lKCktPmxv YWRlcigpLT5jbGllbnQoKS0+ZGlkRGV0ZWN0WFNTKG1fZG9jdW1lbnQtPnVybCgpLCB4c3NJbmZv Lm1fZGlkQmxvY2tFbnRpcmVQYWdlKTsKKyAgICAgICAgZnJhbWVMb2FkZXItPmNsaWVudCgpLT5k aWREZXRlY3RYU1MobV9kb2N1bWVudC0+dXJsKCksIHhzc0luZm8ubV9kaWRCbG9ja0VudGlyZVBh Z2UpOwogICAgICAgICBtX2RpZE5vdGlmeUNsaWVudCA9IHRydWU7CiAgICAgfQogCiAgICAgaWYg KCF4c3NJbmZvLm1fcmVwb3J0VVJMLmlzRW1wdHkoKSkgewogICAgICAgICBSZWZQdHI8SW5zcGVj dG9yT2JqZWN0PiByZXBvcnREZXRhaWxzID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKICAg ICAgICAgcmVwb3J0RGV0YWlscy0+c2V0U3RyaW5nKCJyZXF1ZXN0LXVybCIsIG1fZG9jdW1lbnQt PnVybCgpLnN0cmluZygpKTsKLSAgICAgICAgcmVwb3J0RGV0YWlscy0+c2V0U3RyaW5nKCJyZXF1 ZXN0LWJvZHkiLCB4c3NJbmZvLm1fb3JpZ2luYWxIVFRQQm9keSk7CisKKyAgICAgICAgU3RyaW5n IGh0dHBCb2R5OworICAgICAgICBpZiAoZnJhbWVMb2FkZXItPmRvY3VtZW50TG9hZGVyKCkpIHsK KyAgICAgICAgICAgIEZvcm1EYXRhKiBmb3JtRGF0YSA9IGZyYW1lTG9hZGVyLT5kb2N1bWVudExv YWRlcigpLT5vcmlnaW5hbFJlcXVlc3QoKS5odHRwQm9keSgpOworICAgICAgICAgICAgaWYgKGZv cm1EYXRhKQorICAgICAgICAgICAgICAgIGh0dHBCb2R5ID0gZm9ybURhdGEtPmZsYXR0ZW5Ub1N0 cmluZygpOworICAgICAgICB9CisgICAgICAgIHJlcG9ydERldGFpbHMtPnNldFN0cmluZygicmVx dWVzdC1ib2R5IiwgaHR0cEJvZHkpOwogCiAgICAgICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+ IHJlcG9ydE9iamVjdCA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRlKCk7CiAgICAgICAgIHJlcG9y dE9iamVjdC0+c2V0T2JqZWN0KCJ4c3MtcmVwb3J0IiwgcmVwb3J0RGV0YWlscy5yZWxlYXNlKCkp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvWFNTQXVkaXRvckRlbGVn YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9YU1NBdWRpdG9yRGVsZWdhdGUuaApp bmRleCBjMjJiOTg0NGY2ZGVkMjRhNDBjOTA2ZjdhNDhmMTg3ODQ3ZTczMWNhLi5kZTY4N2Q2YmEy ZTc0MmM1YTY4Y2FhMDhhY2NlMWU5MDI3MzBjZjA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL3BhcnNlci9YU1NBdWRpdG9yRGVsZWdhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL3BhcnNlci9YU1NBdWRpdG9yRGVsZWdhdGUuaApAQCAtMzksMjIgKzM5LDIwIEBAIGNsYXNz IERvY3VtZW50OwogCiBjbGFzcyBYU1NJbmZvIHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUGFzc093 blB0cjxYU1NJbmZvPiBjcmVhdGUoY29uc3QgS1VSTCYgcmVwb3J0VVJMLCBjb25zdCBTdHJpbmcm IG9yaWdpbmFsSFRUUEJvZHksIGJvb2wgZGlkQmxvY2tFbnRpcmVQYWdlKQorICAgIHN0YXRpYyBQ YXNzT3duUHRyPFhTU0luZm8+IGNyZWF0ZShjb25zdCBLVVJMJiByZXBvcnRVUkwsIGJvb2wgZGlk QmxvY2tFbnRpcmVQYWdlKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBYU1NJ bmZvKHJlcG9ydFVSTCwgb3JpZ2luYWxIVFRQQm9keSwgZGlkQmxvY2tFbnRpcmVQYWdlKSk7Cisg ICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgWFNTSW5mbyhyZXBvcnRVUkwsIGRpZEJsb2NrRW50 aXJlUGFnZSkpOwogICAgIH0KIAogICAgIGJvb2wgaXNTYWZlVG9TZW5kVG9Bbm90aGVyVGhyZWFk KCkgY29uc3Q7CiAKICAgICBLVVJMIG1fcmVwb3J0VVJMOwotICAgIFN0cmluZyBtX29yaWdpbmFs SFRUUEJvZHk7CiAgICAgYm9vbCBtX2RpZEJsb2NrRW50aXJlUGFnZTsKICAgICBUZXh0UG9zaXRp b24gbV90ZXh0UG9zaXRpb247CiAKIHByaXZhdGU6Ci0gICAgWFNTSW5mbyhjb25zdCBLVVJMJiBy ZXBvcnRVUkwsIGNvbnN0IFN0cmluZyYgb3JpZ2luYWxIVFRQQm9keSwgYm9vbCBkaWRCbG9ja0Vu dGlyZVBhZ2UpCisgICAgWFNTSW5mbyhjb25zdCBLVVJMJiByZXBvcnRVUkwsIGJvb2wgZGlkQmxv Y2tFbnRpcmVQYWdlKQogICAgICAgICA6IG1fcmVwb3J0VVJMKHJlcG9ydFVSTCkKLSAgICAgICAg LCBtX29yaWdpbmFsSFRUUEJvZHkob3JpZ2luYWxIVFRQQm9keSkKICAgICAgICAgLCBtX2RpZEJs b2NrRW50aXJlUGFnZShkaWRCbG9ja0VudGlyZVBhZ2UpCiAgICAgeyB9CiB9Owo= 192427 2013-03-11 02:22:01 -0700 2013-03-11 02:50:25 -0700 Patch for landing bug-111946-20130311101758.patch text/plain 8223 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWYzODIxMDBmZmZmYzVl NjVkNmViNDMwNjViYzQ2MmYxYjY2YzZkMi4uZGQ2M2U4ZDQ4NDc5ZDVjZjM3NDczZTg1ZWI3MDVm YmQ2NGQ4NGI4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDEzLTAzLTEwICBNaWtl IFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgWFNTQXVkaXRvciBkb2Vzbid0 IG5lZWQgYSBjb3B5IG9mIHRoZSBvcmlnaW5hbCBkb2N1bWVudCdzIGJvZHkuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE5NDYKKworICAgICAgICBS ZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBUaGUgWFNTQXVkaXRvciBjdXJyZW50 bHkgY29waWVzIHRoZSBvcmlnaW5hbCBIVFRQIGJvZHkgb2YgdGhlIGRvY3VtZW50CisgICAgICAg IHRoYXQncyBiZWluZyBhdWRpdGVkIGluIG9yZGVyIHRvIGluY2x1ZGUgaXQgaW50byBhIHZpb2xh dGlvbiByZXBvcnQgaWYKKyAgICAgICAgcmVmbGVjdGVkIFhTUyBpcyBkZXRlY3RlZC4gV2UgZG9u J3QgYWN0dWFsbHkgbmVlZCB0byBkbyB0aGlzLCBhcyB3ZQorICAgICAgICBoYXZlIGFjY2VzcyB0 byB0aGUgb3JpZ2luYWwgcmVxdWVzdCBpbmZvcm1hdGlvbiBmcm9tIGluc2lkZSB0aGUKKyAgICAg ICAgWFNTQXVkaXRvckRlbGVnYXRlIHdoZXJlIHRoZSByZXBvcnQgaXMgZ2VuZXJhdGVkLgorICAg ICAgICBYU1NBdWRpdG9yRGVsZWdhdGU6OmRpZEJsb2NrU2NyaXB0IEFTU0VSVHMgdGhhdCBpdCdz IHJ1bm5pbmcgb24gdGhlCisgICAgICAgIG1haW4gdGhyZWFkLCBzbyBpdCBzaG91bGQgYmUgc2Fm ZSB0byByZWFjaCB0aHJvdWdoIHRoZSBkb2N1bWVudCdzCisgICAgICAgIGxvYWRlciB0byBnZXQg dGhhdCBpbmZvcm1hdGlvbiBkaXJlY3RseSwgcmF0aGVyIHRoYW4gcGFzc2luZyBpdCBmcm9tCisg ICAgICAgIHRocmVhZCB0byB0aHJlYWQgdmlhIFhTU0luZm8gb2JqZWN0IHByb3BlcnRpZXMuCisK KyAgICAgICAgKiBodG1sL3BhcnNlci9YU1NBdWRpdG9yLmg6CisgICAgICAgICogaHRtbC9wYXJz ZXIvWFNTQXVkaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpYU1NBdWRpdG9yOjppbml0KToK KyAgICAgICAgKFdlYkNvcmU6OlhTU0F1ZGl0b3I6OmZpbHRlclRva2VuKToKKyAgICAgICAgKFdl YkNvcmU6OlhTU0F1ZGl0b3I6OmlzU2FmZVRvU2VuZFRvQW5vdGhlclRocmVhZCk6CisgICAgICAg ICogaHRtbC9wYXJzZXIvWFNTQXVkaXRvckRlbGVnYXRlLmg6CisgICAgICAgIChXZWJDb3JlOjpY U1NJbmZvOjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6WFNTSW5mbzo6WFNTSW5mbyk6Cisg ICAgICAgICogaHRtbC9wYXJzZXIvWFNTQXVkaXRvckRlbGVnYXRlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlhTU0luZm86OmlzU2FmZVRvU2VuZFRvQW5vdGhlclRocmVhZCk6CisgICAgICAgICAg ICBEcm9wIHRoZSBYU1NJbmZvIGFuZCBYU1NBdWRpdG9yIHByb3BlcnRpZXMgdGhhdCBoZWxkIGFu CisgICAgICAgICAgICBpc29sYXRlZENvcHkgb2YgdGhlIHRoZSBvcmlnaW5hbCBIVFRQIGJvZHku IERlcGVuZGluZyBvbiB0aGUKKyAgICAgICAgICAgIGRvY3VtZW50J3Mgc2l6ZSwgdGhpcyBjb3Vs ZCBiZSBhIHNpZ25pZmljYW50IHNhdmluZ3MuCisgICAgICAgIChXZWJDb3JlOjpYU1NBdWRpdG9y RGVsZWdhdGU6OmRpZEJsb2NrU2NyaXB0KToKKyAgICAgICAgICAgIFJlYWNoIGludG8gdGhlIGRv Y3VtZW50J3MgbG9hZGVyJ3Mgb3JpZ2luYWwgcmVxdWVzdCBpbiBvcmRlciB0bworICAgICAgICAg ICAgZ3JhYiB0aGUgYm9keSBhcyBhIFN0cmluZywgYW5kIGZlZWQgdGhhdCBpbnRvIHRoZSB2aW9s YXRpb24gcmVwb3J0CisgICAgICAgICAgICBvYmplY3QuCisKKyAgICAgICAgICAgIEFzIGEgZHJp dmUtYnksIHRoaXMgcGF0Y2ggY3JlYXRlcyBhIEZyYW1lTG9hZGVyKiB0ZW1wb3JhcnkKKyAgICAg ICAgICAgIHZhcmlhYmxlIHRvIG1pbmltaXplIHJlcGV0aXRpb24gaW4gdGhpcyBhcmVhIG9mIHRo ZSBjb2RlLiBXZSB1c2UKKyAgICAgICAgICAgIHRoZSBsb2FkZXIgYSBmZXcgdGltZXMsIGJ1dCBz aG91bGQgb25seSBoYXZlIHRvIGdyYWIgaXQgb25jZS4KKwogMjAxMy0wMy0xMCAgQW5kcmVhcyBL bGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgU1ZHRG9jdW1lbnRFeHRlbnNpb25z IHNob3VsZCB1c2UgT3duUHRyIGZvciBwZW5kaW5nIHJlc291cmNlIG1hcHMuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9YU1NBdWRpdG9yLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvcGFyc2VyL1hTU0F1ZGl0b3IuY3BwCmluZGV4IDlmOTNkZWM0YTE1OWUzMjFhNmUy NzlmZjc5ZjJiYTkwMTY4ZmQzY2EuLjE5OTYwNDUyZTcyYzkwYmRiZjI1ODUyYmMxMjk3MzFmNzZh ZTZmZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL1hTU0F1ZGl0b3Iu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL1hTU0F1ZGl0b3IuY3BwCkBAIC0z MTEsOSArMzExLDYgQEAgdm9pZCBYU1NBdWRpdG9yOjppbml0KERvY3VtZW50KiBkb2N1bWVudCkK ICAgICAgICAgbV9pc0VuYWJsZWQgPSBmYWxzZTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLQot ICAgIGlmICghbV9yZXBvcnRVUkwuaXNFbXB0eSgpKQotICAgICAgICBtX29yaWdpbmFsSFRUUEJv ZHkgPSBodHRwQm9keUFzU3RyaW5nOwogfQogCiBQYXNzT3duUHRyPFhTU0luZm8+IFhTU0F1ZGl0 b3I6OmZpbHRlclRva2VuKGNvbnN0IEZpbHRlclRva2VuUmVxdWVzdCYgcmVxdWVzdCkKQEAgLTMz NCwxMSArMzMxLDggQEAgUGFzc093blB0cjxYU1NJbmZvPiBYU1NBdWRpdG9yOjpmaWx0ZXJUb2tl bihjb25zdCBGaWx0ZXJUb2tlblJlcXVlc3QmIHJlcXVlc3QpCiAKICAgICBpZiAoZGlkQmxvY2tT Y3JpcHQpIHsKICAgICAgICAgYm9vbCBkaWRCbG9ja0VudGlyZVBhZ2UgPSAobV94c3NQcm90ZWN0 aW9uID09IENvbnRlbnRTZWN1cml0eVBvbGljeTo6QmxvY2tSZWZsZWN0ZWRYU1MpOwotICAgICAg ICBPd25QdHI8WFNTSW5mbz4geHNzSW5mbyA9IFhTU0luZm86OmNyZWF0ZShtX3JlcG9ydFVSTCwg bV9vcmlnaW5hbEhUVFBCb2R5LCBkaWRCbG9ja0VudGlyZVBhZ2UpOwotICAgICAgICBpZiAoIW1f cmVwb3J0VVJMLmlzRW1wdHkoKSkgewotICAgICAgICAgICAgbV9yZXBvcnRVUkwgPSBLVVJMKCk7 Ci0gICAgICAgICAgICBtX29yaWdpbmFsSFRUUEJvZHkgPSBTdHJpbmcoKTsKLSAgICAgICAgfQor ICAgICAgICBPd25QdHI8WFNTSW5mbz4geHNzSW5mbyA9IFhTU0luZm86OmNyZWF0ZShtX3JlcG9y dFVSTCwgZGlkQmxvY2tFbnRpcmVQYWdlKTsKKyAgICAgICAgbV9yZXBvcnRVUkwgPSBLVVJMKCk7 CiAgICAgICAgIHJldHVybiB4c3NJbmZvLnJlbGVhc2UoKTsKICAgICB9CiAgICAgcmV0dXJuIG51 bGxwdHI7CkBAIC03MjcsNyArNzIxLDYgQEAgYm9vbCBYU1NBdWRpdG9yOjppc0xpa2VseVNhZmVS ZXNvdXJjZShjb25zdCBTdHJpbmcmIHVybCkKIGJvb2wgWFNTQXVkaXRvcjo6aXNTYWZlVG9TZW5k VG9Bbm90aGVyVGhyZWFkKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9kb2N1bWVudFVSTC5pc1Nh ZmVUb1NlbmRUb0Fub3RoZXJUaHJlYWQoKQotICAgICAgICAmJiBtX29yaWdpbmFsSFRUUEJvZHku aXNTYWZlVG9TZW5kVG9Bbm90aGVyVGhyZWFkKCkKICAgICAgICAgJiYgbV9kZWNvZGVkVVJMLmlz U2FmZVRvU2VuZFRvQW5vdGhlclRocmVhZCgpCiAgICAgICAgICYmIG1fZGVjb2RlZEhUVFBCb2R5 LmlzU2FmZVRvU2VuZFRvQW5vdGhlclRocmVhZCgpCiAgICAgICAgICYmIG1fY2FjaGVkRGVjb2Rl ZFNuaXBwZXQuaXNTYWZlVG9TZW5kVG9Bbm90aGVyVGhyZWFkKCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvcGFyc2VyL1hTU0F1ZGl0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv cGFyc2VyL1hTU0F1ZGl0b3IuaAppbmRleCBhNjZmNjZlZGI4M2NmMWQ4YjA1MGI3YjUyYzFjOWQ1 ZGNjMjgxMjkwLi43MjMwZGE0MGUwODY3MGUyMDdlZjAwMmExMWJlMmVhZmIxY2E4MGFkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9YU1NBdWRpdG9yLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvWFNTQXVkaXRvci5oCkBAIC0xMDUsNyArMTA1LDYgQEAg cHJpdmF0ZToKICAgICBib29sIG1faXNFbmFibGVkOwogICAgIENvbnRlbnRTZWN1cml0eVBvbGlj eTo6UmVmbGVjdGVkWFNTRGlzcG9zaXRpb24gbV94c3NQcm90ZWN0aW9uOwogCi0gICAgU3RyaW5n IG1fb3JpZ2luYWxIVFRQQm9keTsKICAgICBTdHJpbmcgbV9kZWNvZGVkVVJMOwogICAgIFN0cmlu ZyBtX2RlY29kZWRIVFRQQm9keTsKICAgICBPd25QdHI8U3VmZml4VHJlZTxBU0NJSUNvZGVib29r PiA+IG1fZGVjb2RlZEhUVFBCb2R5U3VmZml4VHJlZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvcGFyc2VyL1hTU0F1ZGl0b3JEZWxlZ2F0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL3BhcnNlci9YU1NBdWRpdG9yRGVsZWdhdGUuY3BwCmluZGV4IDA2ZjhjNmNmZWJlMjY4NGJm N2RkMzAyZDk4MDZlYWFjNTUyODE4NDYuLmEyODNkNjI3MzUzZmFhNzczMDAxY2ZiMjc5MGY1OWUy ODcwMjY1MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL1hTU0F1ZGl0 b3JEZWxlZ2F0ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvWFNTQXVkaXRv ckRlbGVnYXRlLmNwcApAQCAtMjksNiArMjksNyBAQAogI2luY2x1ZGUgIkNvbnNvbGUuaCIKICNp bmNsdWRlICJET01XaW5kb3cuaCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgorI2luY2x1ZGUgIkRv Y3VtZW50TG9hZGVyLmgiCiAjaW5jbHVkZSAiRm9ybURhdGEuaCIKICNpbmNsdWRlICJGcmFtZS5o IgogI2luY2x1ZGUgIkZyYW1lTG9hZGVyLmgiCkBAIC00Miw4ICs0Myw3IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAogYm9vbCBYU1NJbmZvOjppc1NhZmVUb1NlbmRUb0Fub3RoZXJUaHJlYWQoKSBj b25zdAogewotICAgIHJldHVybiBtX3JlcG9ydFVSTC5pc1NhZmVUb1NlbmRUb0Fub3RoZXJUaHJl YWQoKQotICAgICAgICAmJiBtX29yaWdpbmFsSFRUUEJvZHkuaXNTYWZlVG9TZW5kVG9Bbm90aGVy VGhyZWFkKCk7CisgICAgcmV0dXJuIG1fcmVwb3J0VVJMLmlzU2FmZVRvU2VuZFRvQW5vdGhlclRo cmVhZCgpOwogfQogCiBYU1NBdWRpdG9yRGVsZWdhdGU6OlhTU0F1ZGl0b3JEZWxlZ2F0ZShEb2N1 bWVudCogZG9jdW1lbnQpCkBAIC02MiwxOCArNjIsMjYgQEAgdm9pZCBYU1NBdWRpdG9yRGVsZWdh dGU6OmRpZEJsb2NrU2NyaXB0KGNvbnN0IFhTU0luZm8mIHhzc0luZm8pCiAgICAgREVGSU5FX1NU QVRJQ19MT0NBTChTdHJpbmcsIGNvbnNvbGVNZXNzYWdlLCAoQVNDSUlMaXRlcmFsKCJSZWZ1c2Vk IHRvIGV4ZWN1dGUgYSBKYXZhU2NyaXB0IHNjcmlwdC4gU291cmNlIGNvZGUgb2Ygc2NyaXB0IGZv dW5kIHdpdGhpbiByZXF1ZXN0LlxuIikpKTsKICAgICBtX2RvY3VtZW50LT5hZGRDb25zb2xlTWVz c2FnZShTZWN1cml0eU1lc3NhZ2VTb3VyY2UsIEVycm9yTWVzc2FnZUxldmVsLCBjb25zb2xlTWVz c2FnZSk7CiAKKyAgICBGcmFtZUxvYWRlciogZnJhbWVMb2FkZXIgPSBtX2RvY3VtZW50LT5mcmFt ZSgpLT5sb2FkZXIoKTsKKwogICAgIGlmICh4c3NJbmZvLm1fZGlkQmxvY2tFbnRpcmVQYWdlKQot ICAgICAgICBtX2RvY3VtZW50LT5mcmFtZSgpLT5sb2FkZXIoKS0+c3RvcEFsbExvYWRlcnMoKTsK KyAgICAgICAgZnJhbWVMb2FkZXItPnN0b3BBbGxMb2FkZXJzKCk7CiAKICAgICBpZiAoIW1fZGlk Tm90aWZ5Q2xpZW50KSB7Ci0gICAgICAgIG1fZG9jdW1lbnQtPmZyYW1lKCktPmxvYWRlcigpLT5j bGllbnQoKS0+ZGlkRGV0ZWN0WFNTKG1fZG9jdW1lbnQtPnVybCgpLCB4c3NJbmZvLm1fZGlkQmxv Y2tFbnRpcmVQYWdlKTsKKyAgICAgICAgZnJhbWVMb2FkZXItPmNsaWVudCgpLT5kaWREZXRlY3RY U1MobV9kb2N1bWVudC0+dXJsKCksIHhzc0luZm8ubV9kaWRCbG9ja0VudGlyZVBhZ2UpOwogICAg ICAgICBtX2RpZE5vdGlmeUNsaWVudCA9IHRydWU7CiAgICAgfQogCiAgICAgaWYgKCF4c3NJbmZv Lm1fcmVwb3J0VVJMLmlzRW1wdHkoKSkgewogICAgICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0 PiByZXBvcnREZXRhaWxzID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKICAgICAgICAgcmVw b3J0RGV0YWlscy0+c2V0U3RyaW5nKCJyZXF1ZXN0LXVybCIsIG1fZG9jdW1lbnQtPnVybCgpLnN0 cmluZygpKTsKLSAgICAgICAgcmVwb3J0RGV0YWlscy0+c2V0U3RyaW5nKCJyZXF1ZXN0LWJvZHki LCB4c3NJbmZvLm1fb3JpZ2luYWxIVFRQQm9keSk7CisKKyAgICAgICAgU3RyaW5nIGh0dHBCb2R5 OworICAgICAgICBpZiAoZnJhbWVMb2FkZXItPmRvY3VtZW50TG9hZGVyKCkpIHsKKyAgICAgICAg ICAgIGlmIChGb3JtRGF0YSogZm9ybURhdGEgPSBmcmFtZUxvYWRlci0+ZG9jdW1lbnRMb2FkZXIo KS0+b3JpZ2luYWxSZXF1ZXN0KCkuaHR0cEJvZHkoKSkKKyAgICAgICAgICAgICAgICBodHRwQm9k eSA9IGZvcm1EYXRhLT5mbGF0dGVuVG9TdHJpbmcoKTsKKyAgICAgICAgfQorICAgICAgICByZXBv cnREZXRhaWxzLT5zZXRTdHJpbmcoInJlcXVlc3QtYm9keSIsIGh0dHBCb2R5KTsKIAogICAgICAg ICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZXBvcnRPYmplY3QgPSBJbnNwZWN0b3JPYmplY3Q6 OmNyZWF0ZSgpOwogICAgICAgICByZXBvcnRPYmplY3QtPnNldE9iamVjdCgieHNzLXJlcG9ydCIs IHJlcG9ydERldGFpbHMucmVsZWFzZSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL1hTU0F1ZGl0b3JEZWxlZ2F0ZS5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJz ZXIvWFNTQXVkaXRvckRlbGVnYXRlLmgKaW5kZXggYzIyYjk4NDRmNmRlZDI0YTQwYzkwNmY3YTQ4 ZjE4Nzg0N2U3MzFjYS4uZGU2ODdkNmJhMmU3NDJjNWE2OGNhYTA4YWNjZTFlOTAyNzMwY2YwOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvWFNTQXVkaXRvckRlbGVnYXRl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvWFNTQXVkaXRvckRlbGVnYXRlLmgK QEAgLTM5LDIyICszOSwyMCBAQCBjbGFzcyBEb2N1bWVudDsKIAogY2xhc3MgWFNTSW5mbyB7CiBw dWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8WFNTSW5mbz4gY3JlYXRlKGNvbnN0IEtVUkwm IHJlcG9ydFVSTCwgY29uc3QgU3RyaW5nJiBvcmlnaW5hbEhUVFBCb2R5LCBib29sIGRpZEJsb2Nr RW50aXJlUGFnZSkKKyAgICBzdGF0aWMgUGFzc093blB0cjxYU1NJbmZvPiBjcmVhdGUoY29uc3Qg S1VSTCYgcmVwb3J0VVJMLCBib29sIGRpZEJsb2NrRW50aXJlUGFnZSkKICAgICB7Ci0gICAgICAg IHJldHVybiBhZG9wdFB0cihuZXcgWFNTSW5mbyhyZXBvcnRVUkwsIG9yaWdpbmFsSFRUUEJvZHks IGRpZEJsb2NrRW50aXJlUGFnZSkpOworICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IFhTU0lu Zm8ocmVwb3J0VVJMLCBkaWRCbG9ja0VudGlyZVBhZ2UpKTsKICAgICB9CiAKICAgICBib29sIGlz U2FmZVRvU2VuZFRvQW5vdGhlclRocmVhZCgpIGNvbnN0OwogCiAgICAgS1VSTCBtX3JlcG9ydFVS TDsKLSAgICBTdHJpbmcgbV9vcmlnaW5hbEhUVFBCb2R5OwogICAgIGJvb2wgbV9kaWRCbG9ja0Vu dGlyZVBhZ2U7CiAgICAgVGV4dFBvc2l0aW9uIG1fdGV4dFBvc2l0aW9uOwogCiBwcml2YXRlOgot ICAgIFhTU0luZm8oY29uc3QgS1VSTCYgcmVwb3J0VVJMLCBjb25zdCBTdHJpbmcmIG9yaWdpbmFs SFRUUEJvZHksIGJvb2wgZGlkQmxvY2tFbnRpcmVQYWdlKQorICAgIFhTU0luZm8oY29uc3QgS1VS TCYgcmVwb3J0VVJMLCBib29sIGRpZEJsb2NrRW50aXJlUGFnZSkKICAgICAgICAgOiBtX3JlcG9y dFVSTChyZXBvcnRVUkwpCi0gICAgICAgICwgbV9vcmlnaW5hbEhUVFBCb2R5KG9yaWdpbmFsSFRU UEJvZHkpCiAgICAgICAgICwgbV9kaWRCbG9ja0VudGlyZVBhZ2UoZGlkQmxvY2tFbnRpcmVQYWdl KQogICAgIHsgfQogfTsK