104244 2012-12-06 02:12:46 -0800 Use ownerNode() instead of base() in HTMLCollection 2012-12-06 09:53:37 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 78909 1 rniwa rniwa abarth eric haraken japhet kling koivisto mifenton ojan sam tkent webkit.review.bot oldest_to_newest 784778 0 rniwa 2012-12-06 02:12:46 -0800 Use ownerNode() instead of base() in HTMLCollection 784780 1 177976 rniwa 2012-12-06 02:17:03 -0800 Created attachment 177976 Cleanup 784782 2 177976 rniwa 2012-12-06 02:19:22 -0800 Comment on attachment 177976 Cleanup View in context: https://bugs.webkit.org/attachment.cgi?id=177976&action=review > Source/WebCore/html/HTMLCollection.h:-65 > - Node* base() const { return ownerNode(); } This entire patch exists to remove this one line :( 784993 3 rniwa 2012-12-06 09:53:37 -0800 Committed r136850: <http://trac.webkit.org/changeset/136850> 177976 2012-12-06 02:17:03 -0800 2012-12-06 08:44:34 -0800 Cleanup bug-104244-20121206021426.patch text/plain 22837 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNjgyNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDYxIEBACisyMDEyLTEyLTA2ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFVzZSBvd25lck5vZGUoKSBpbnN0 ZWFkIG9mIGJhc2UoKSBpbiBIVE1MQ29sbGVjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0MjQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIG93bmVyTm9kZSgpIGluc3RlYWQgb2YgYmFzZSgp IGluIEhUTUxDb2xsZWN0aW9uIHRvIG1hdGNoIExpdmVOb2RlTGlzdC4KKyAgICAgICAgTm90aWNl IHRoYXQgdGhlIGRlZmluaXRpb24gb2YgYmFzZSgpLCB3aGljaCB0aGlzIHBhdGNoIHJlbW92ZXMs IGlzICJyZXR1cm4gb3duZXJOb2RlKCkiLgorCisgICAgICAgICogYmluZGluZ3MvanMvSlNIVE1M Rm9ybUNvbnRyb2xzQ29sbGVjdGlvbkN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnZXRO YW1lZEl0ZW1zKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0hUTUxPcHRpb25zQ29sbGVjdGlv bkN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0hUTUxPcHRpb25zQ29sbGVjdGlvbjo6 aW5kZXhTZXR0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6SlNIVE1MT3B0aW9uc0NvbGxlY3Rpb246 OnJlbW92ZSk6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG06 CisgICAgICAgIChHZW5lcmF0ZUltcGxlbWVudGF0aW9uKToKKyAgICAgICAgKiBiaW5kaW5ncy9z Y3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbToKKyAgICAgICAgKEdlbmVyYXRlT3BhcXVlUm9vdEZv ckdDKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0lETEF0dHJpYnV0ZXMudHh0OgorICAg ICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxGb3JtQ29udHJvbHNDb2xsZWN0aW9uQ3Vz dG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmdldE5hbWVkSXRlbXMpOgorICAgICAgICAqIGJp bmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxPcHRpb25zQ29sbGVjdGlvbkN1c3RvbS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpWOEhUTUxPcHRpb25zQ29sbGVjdGlvbjo6cmVtb3ZlQ2FsbGJhY2spOgor ICAgICAgICAoV2ViQ29yZTo6VjhIVE1MT3B0aW9uc0NvbGxlY3Rpb246OmluZGV4ZWRQcm9wZXJ0 eVNldHRlcik6CisgICAgICAgICogZG9tL1dlYktpdE5hbWVkRmxvdy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpXZWJLaXROYW1lZEZsb3c6Om93bmVyTm9kZSk6CisgICAgICAgICogZG9tL1dlYktp dE5hbWVkRmxvdy5oOgorICAgICAgICAoV2ViS2l0TmFtZWRGbG93KToKKyAgICAgICAgKiBkb20v V2ViS2l0TmFtZWRGbG93LmlkbDoKKyAgICAgICAgKiBodG1sL0hUTUxBbGxDb2xsZWN0aW9uLmlk bDoKKyAgICAgICAgKiBodG1sL0hUTUxDb2xsZWN0aW9uLmg6CisgICAgICAgIChIVE1MQ29sbGVj dGlvbik6CisgICAgICAgICogaHRtbC9IVE1MQ29sbGVjdGlvbi5pZGw6CisgICAgICAgICogaHRt bC9IVE1MRm9ybUNvbnRyb2xzQ29sbGVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1M Rm9ybUNvbnRyb2xzQ29sbGVjdGlvbjo6SFRNTEZvcm1Db250cm9sc0NvbGxlY3Rpb24pOgorICAg ICAgICAoV2ViQ29yZTo6SFRNTEZvcm1Db250cm9sc0NvbGxlY3Rpb246OmNyZWF0ZSk6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MRm9ybUNvbnRyb2xzQ29sbGVjdGlvbjo6Zm9ybUNvbnRyb2xFbGVt ZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRm9ybUNvbnRyb2xzQ29sbGVjdGlvbjo6Zm9y bUltYWdlRWxlbWVudHMpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEZvcm1Db250cm9sc0NvbGxl Y3Rpb246Om5hbWVkSXRlbSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRm9ybUNvbnRyb2xzQ29s bGVjdGlvbjo6dXBkYXRlTmFtZUNhY2hlKToKKyAgICAgICAgKiBodG1sL0hUTUxGb3JtQ29udHJv bHNDb2xsZWN0aW9uLmlkbDoKKyAgICAgICAgKiBodG1sL0hUTUxOYW1lQ29sbGVjdGlvbi5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpIVE1MTmFtZUNvbGxlY3Rpb246On5IVE1MTmFtZUNvbGxlY3Rp b24pOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE5hbWVDb2xsZWN0aW9uOjp2aXJ0dWFsSXRlbUFm dGVyKToKKyAgICAgICAgKiBodG1sL0hUTUxPcHRpb25zQ29sbGVjdGlvbi5jcHA6CisgICAgICAg IChXZWJDb3JlOjpIVE1MT3B0aW9uc0NvbGxlY3Rpb246OmFkZCk6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MT3B0aW9uc0NvbGxlY3Rpb246OnJlbW92ZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1M T3B0aW9uc0NvbGxlY3Rpb246OnNlbGVjdGVkSW5kZXgpOgorICAgICAgICAoV2ViQ29yZTo6SFRN TE9wdGlvbnNDb2xsZWN0aW9uOjpzZXRTZWxlY3RlZEluZGV4KToKKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxPcHRpb25zQ29sbGVjdGlvbjo6c2V0TGVuZ3RoKToKKyAgICAgICAgKiBodG1sL0hUTUxP cHRpb25zQ29sbGVjdGlvbi5pZGw6CisgICAgICAgICogaHRtbC9IVE1MUHJvcGVydGllc0NvbGxl Y3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFByb3BlcnRpZXNDb2xsZWN0aW9uOjp1 cGRhdGVSZWZFbGVtZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MUHJvcGVydGllc0NvbGxl Y3Rpb246Om5hbWVkSXRlbSk6CisgICAgICAgICogaHRtbC9IVE1MVGFibGVSb3dzQ29sbGVjdGlv bi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVGFibGVSb3dzQ29sbGVjdGlvbjo6dmlydHVh bEl0ZW1BZnRlcik6CisKIDIwMTItMTItMDYgIFVsYW4gRGVnZW5iYWV2ICA8dWxhbkBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgW3Y4XSBGaXggaGlkZGVuIHByb3BlcnR5IG5hbWUgb2YgVjhBcnJh eUJ1ZmZlclZpZXcgZmxhZy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSFRN TEZvcm1Db250cm9sc0NvbGxlY3Rpb25DdXN0b20uY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0pTSFRNTEZvcm1Db250cm9sc0NvbGxlY3Rpb25DdXN0b20uY3Bw CShyZXZpc2lvbiAxMzY4MTEpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0hUTUxG b3JtQ29udHJvbHNDb2xsZWN0aW9uQ3VzdG9tLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDksNyAr NDksNyBAQCBzdGF0aWMgSlNWYWx1ZSBnZXROYW1lZEl0ZW1zKEV4ZWNTdGF0ZSogCiAgICAgICAg IHJldHVybiB0b0pTKGV4ZWMsIGNvbGxlY3Rpb24tPmdsb2JhbE9iamVjdCgpLCBuYW1lZEl0ZW1z WzBdLmdldCgpKTsKIAogICAgIEFTU0VSVChjb2xsZWN0aW9uLT5pbXBsKCktPnR5cGUoKSA9PSBG b3JtQ29udHJvbHMpOwotICAgIHJldHVybiB0b0pTKGV4ZWMsIGNvbGxlY3Rpb24tPmdsb2JhbE9i amVjdCgpLCBjb2xsZWN0aW9uLT5pbXBsKCktPmJhc2UoKS0+cmFkaW9Ob2RlTGlzdChuYW1lKS5n ZXQoKSk7CisgICAgcmV0dXJuIHRvSlMoZXhlYywgY29sbGVjdGlvbi0+Z2xvYmFsT2JqZWN0KCks IGNvbGxlY3Rpb24tPmltcGwoKS0+b3duZXJOb2RlKCktPnJhZGlvTm9kZUxpc3QobmFtZSkuZ2V0 KCkpOwogfQogCiBib29sIEpTSFRNTEZvcm1Db250cm9sc0NvbGxlY3Rpb246OmNhbkdldEl0ZW1z Rm9yTmFtZShFeGVjU3RhdGUqLCBIVE1MRm9ybUNvbnRyb2xzQ29sbGVjdGlvbiogY29sbGVjdGlv biwgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTSFRNTE9wdGlvbnNDb2xsZWN0aW9uQ3VzdG9tLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0hUTUxPcHRpb25zQ29sbGVjdGlvbkN1c3RvbS5j cHAJKHJldmlzaW9uIDEzNjgxMSkKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSFRN TE9wdGlvbnNDb2xsZWN0aW9uQ3VzdG9tLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTAsNyArOTAs NyBAQCB2b2lkIEpTSFRNTE9wdGlvbnNDb2xsZWN0aW9uOjpzZXRMZW5ndGgoCiB2b2lkIEpTSFRN TE9wdGlvbnNDb2xsZWN0aW9uOjppbmRleFNldHRlcihFeGVjU3RhdGUqIGV4ZWMsIHVuc2lnbmVk IGluZGV4LCBKU1ZhbHVlIHZhbHVlKQogewogICAgIEhUTUxPcHRpb25zQ29sbGVjdGlvbiogaW1w ID0gc3RhdGljX2Nhc3Q8SFRNTE9wdGlvbnNDb2xsZWN0aW9uKj4oaW1wbCgpKTsKLSAgICBIVE1M U2VsZWN0RWxlbWVudCogYmFzZSA9IHRvSFRNTFNlbGVjdEVsZW1lbnQoaW1wLT5iYXNlKCkpOwor ICAgIEhUTUxTZWxlY3RFbGVtZW50KiBiYXNlID0gdG9IVE1MU2VsZWN0RWxlbWVudChpbXAtPm93 bmVyTm9kZSgpKTsKICAgICBzZWxlY3RJbmRleFNldHRlcihiYXNlLCBleGVjLCBpbmRleCwgdmFs dWUpOwogfQogCkBAIC0xMTgsNyArMTE4LDcgQEAgSlNWYWx1ZSBKU0hUTUxPcHRpb25zQ29sbGVj dGlvbjo6YWRkKEV4ZQogSlNWYWx1ZSBKU0hUTUxPcHRpb25zQ29sbGVjdGlvbjo6cmVtb3ZlKEV4 ZWNTdGF0ZSogZXhlYykKIHsKICAgICBIVE1MT3B0aW9uc0NvbGxlY3Rpb24qIGltcCA9IHN0YXRp Y19jYXN0PEhUTUxPcHRpb25zQ29sbGVjdGlvbio+KGltcGwoKSk7Ci0gICAgSlNIVE1MU2VsZWN0 RWxlbWVudCogYmFzZSA9IGpzQ2FzdDxKU0hUTUxTZWxlY3RFbGVtZW50Kj4oYXNPYmplY3QodG9K UyhleGVjLCBnbG9iYWxPYmplY3QoKSwgaW1wLT5iYXNlKCkpKSk7CisgICAgSlNIVE1MU2VsZWN0 RWxlbWVudCogYmFzZSA9IGpzQ2FzdDxKU0hUTUxTZWxlY3RFbGVtZW50Kj4oYXNPYmplY3QodG9K UyhleGVjLCBnbG9iYWxPYmplY3QoKSwgaW1wLT5vd25lck5vZGUoKSkpKTsKICAgICByZXR1cm4g YmFzZS0+cmVtb3ZlKGV4ZWMpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQkocmV2aXNpb24gMTM2ODExKQorKysg U291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0JKHdvcmtp bmcgY29weSkKQEAgLTI1MTAsOCArMjUxMCw4IEBAIHN1YiBHZW5lcmF0ZUltcGxlbWVudGF0aW9u CiAgICAgICAgICAgICAgICAgJHJvb3RTdHJpbmcgLj0gIiAgICB2b2lkKiByb290ID0gV2ViQ29y ZTo6cm9vdChlbGVtZW50KTtcbiI7CiAgICAgICAgICAgICB9IGVsc2lmICgkaW50ZXJmYWNlTmFt ZSBlcSAiQ2FudmFzUmVuZGVyaW5nQ29udGV4dCIpIHsKICAgICAgICAgICAgICAgICAkcm9vdFN0 cmluZyAgPSAiICAgIHZvaWQqIHJvb3QgPSBXZWJDb3JlOjpyb290KGpzJHtpbnRlcmZhY2VOYW1l fS0+aW1wbCgpLT5jYW52YXMoKSk7XG4iOwotICAgICAgICAgICAgfSBlbHNpZiAoR2V0R2VuZXJh dGVJc1JlYWNoYWJsZSgkaW50ZXJmYWNlKSBlcSAiSW1wbEJhc2VSb290IikgewotICAgICAgICAg ICAgICAgICRyb290U3RyaW5nICA9ICIgICAgdm9pZCogcm9vdCA9IFdlYkNvcmU6OnJvb3QoanMk e2ludGVyZmFjZU5hbWV9LT5pbXBsKCktPmJhc2UoKSk7XG4iOworICAgICAgICAgICAgfSBlbHNp ZiAoR2V0R2VuZXJhdGVJc1JlYWNoYWJsZSgkaW50ZXJmYWNlKSBlcSAiSW1wbE93bmVyTm9kZVJv b3QiKSB7CisgICAgICAgICAgICAgICAgJHJvb3RTdHJpbmcgID0gIiAgICB2b2lkKiByb290ID0g V2ViQ29yZTo6cm9vdChqcyR7aW50ZXJmYWNlTmFtZX0tPmltcGwoKS0+b3duZXJOb2RlKCkpO1xu IjsKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgJHJvb3RTdHJpbmcgID0g IiAgICB2b2lkKiByb290ID0gV2ViQ29yZTo6cm9vdChqcyR7aW50ZXJmYWNlTmFtZX0tPmltcGwo KSk7XG4iOwogICAgICAgICAgICAgfQpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0JKHJldmlzaW9uIDEzNjgxMSkKKysrIFNv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCSh3b3JraW5n IGNvcHkpCkBAIC0xOTUsOCArMTk1LDcgQEAgRU5ECiAgICAgaWYgKEdldEdlbmVyYXRlSXNSZWFj aGFibGUoJGludGVyZmFjZSkgZXEgICJJbXBsRG9jdW1lbnQiIHx8CiAgICAgICAgIEdldEdlbmVy YXRlSXNSZWFjaGFibGUoJGludGVyZmFjZSkgZXEgICJJbXBsRWxlbWVudFJvb3QiIHx8CiAgICAg ICAgIEdldEdlbmVyYXRlSXNSZWFjaGFibGUoJGludGVyZmFjZSkgZXEgICJJbXBsT3duZXJSb290 IiB8fAotICAgICAgICBHZXRHZW5lcmF0ZUlzUmVhY2hhYmxlKCRpbnRlcmZhY2UpIGVxICAiSW1w bE93bmVyTm9kZVJvb3QiIHx8Ci0gICAgICAgIEdldEdlbmVyYXRlSXNSZWFjaGFibGUoJGludGVy ZmFjZSkgZXEgICJJbXBsQmFzZVJvb3QiKSB7CisgICAgICAgIEdldEdlbmVyYXRlSXNSZWFjaGFi bGUoJGludGVyZmFjZSkgZXEgICJJbXBsT3duZXJOb2RlUm9vdCIpIHsKIAogICAgICAgICAkaW1w bEluY2x1ZGVzeyJWOEdDQ29udHJvbGxlci5oIn0gPSAxOwogCkBAIC0yMDUsNyArMjA0LDYgQEAg RU5ECiAgICAgICAgICRtZXRob2ROYW1lID0gImVsZW1lbnQiIGlmIChHZXRHZW5lcmF0ZUlzUmVh Y2hhYmxlKCRpbnRlcmZhY2UpIGVxICJJbXBsRWxlbWVudFJvb3QiKTsKICAgICAgICAgJG1ldGhv ZE5hbWUgPSAib3duZXIiIGlmIChHZXRHZW5lcmF0ZUlzUmVhY2hhYmxlKCRpbnRlcmZhY2UpIGVx ICJJbXBsT3duZXJSb290Iik7CiAgICAgICAgICRtZXRob2ROYW1lID0gIm93bmVyTm9kZSIgaWYg KEdldEdlbmVyYXRlSXNSZWFjaGFibGUoJGludGVyZmFjZSkgZXEgIkltcGxPd25lck5vZGVSb290 Iik7Ci0gICAgICAgICRtZXRob2ROYW1lID0gImJhc2UiIGlmIChHZXRHZW5lcmF0ZUlzUmVhY2hh YmxlKCRpbnRlcmZhY2UpIGVxICJJbXBsQmFzZVJvb3QiKTsKIAogICAgICAgICBwdXNoKEBpbXBs Q29udGVudCwgPDxFTkQpOwogICAgIGlmIChOb2RlKiBvd25lciA9IGltcGwtPiR7bWV0aG9kTmFt ZX0oKSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvSURMQXR0cmlidXRl cy50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9JRExB dHRyaWJ1dGVzLnR4dAkocmV2aXNpb24gMTM2ODExKQorKysgU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy9JRExBdHRyaWJ1dGVzLnR4dAkod29ya2luZyBjb3B5KQpAQCAtNTMsNyArNTMs NyBAQCBEb05vdENoZWNrU2VjdXJpdHlPbkdldHRlcgogRG9Ob3RDaGVja1NlY3VyaXR5T25TZXR0 ZXIKIEV2ZW50VGFyZ2V0CiBFeHRlbmRzRE9NR2xvYmFsT2JqZWN0Ci1HZW5lcmF0ZUlzUmVhY2hh YmxlPUltcGxEb2N1bWVudHxJbXBsRWxlbWVudFJvb3R8SW1wbEJhc2VSb290CitHZW5lcmF0ZUlz UmVhY2hhYmxlPUltcGxEb2N1bWVudHxJbXBsRWxlbWVudFJvb3R8SW1wbE93bmVyTm9kZVJvb3QK IEltbXV0YWJsZQogSW1wbGVtZW50ZWRBcz0qCiBJbmRleGVkR2V0dGVyCkBAIC03Niw3ICs3Niw3 IEBAIEpTQ3VzdG9tUHVzaEV2ZW50SGFuZGxlclNjb3BlCiBKU0N1c3RvbVNldHRlcgogSlNDdXN0 b21Ub0pTT2JqZWN0CiBKU0N1c3RvbVRvTmF0aXZlT2JqZWN0Ci1KU0dlbmVyYXRlSXNSZWFjaGFi bGU9fEltcGx8SW1wbENvbnRleHR8SW1wbERvY3VtZW50fEltcGxFbGVtZW50Um9vdHxJbXBsRnJh bWV8SW1wbEJhc2VSb290CitKU0dlbmVyYXRlSXNSZWFjaGFibGU9fEltcGx8SW1wbENvbnRleHR8 SW1wbERvY3VtZW50fEltcGxFbGVtZW50Um9vdHxJbXBsRnJhbWV8SW1wbE93bmVyTm9kZVJvb3QK IEpTR2VuZXJhdGVUb0pTT2JqZWN0CiBKU0dlbmVyYXRlVG9OYXRpdmVPYmplY3QKIEpTSW5saW5l R2V0T3duUHJvcGVydHlTbG90CkBAIC0xMTgsNyArMTE4LDcgQEAgVjhEZXBlbmRlbnRMaWZldGlt ZQogVjhEb05vdENoZWNrU2lnbmF0dXJlCiBWOEVuYWJsZWRBdFJ1bnRpbWU9KgogVjhFbmFibGVk UGVyQ29udGV4dD0qCi1WOEdlbmVyYXRlSXNSZWFjaGFibGU9SW1wbERvY3VtZW50fEltcGxFbGVt ZW50Um9vdHxJbXBsT3duZXJSb290fEltcGxPd25lck5vZGVSb290fEltcGxCYXNlUm9vdAorVjhH ZW5lcmF0ZUlzUmVhY2hhYmxlPUltcGxEb2N1bWVudHxJbXBsRWxlbWVudFJvb3R8SW1wbE93bmVy Um9vdHxJbXBsT3duZXJOb2RlUm9vdAogVjhOb1dyYXBwZXJDYWNoZQogVjhNZWFzdXJlQXM9Kgog VjhSZWFkT25seQpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRN TEZvcm1Db250cm9sc0NvbGxlY3Rpb25DdXN0b20uY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxGb3JtQ29udHJvbHNDb2xsZWN0aW9uQ3Vz dG9tLmNwcAkocmV2aXNpb24gMTM2ODExKQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv Y3VzdG9tL1Y4SFRNTEZvcm1Db250cm9sc0NvbGxlY3Rpb25DdXN0b20uY3BwCSh3b3JraW5nIGNv cHkpCkBAIC01MCw3ICs1MCw3IEBAIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gZ2V0TmFt ZWRJdGUKICAgICBpZiAobmFtZWRJdGVtcy5zaXplKCkgPT0gMSkKICAgICAgICAgcmV0dXJuIHRv VjgobmFtZWRJdGVtcy5hdCgwKS5yZWxlYXNlKCksIGNyZWF0aW9uQ29udGV4dCwgaXNvbGF0ZSk7 CiAKLSAgICByZXR1cm4gdG9WOChjb2xsZWN0aW9uLT5iYXNlKCktPnJhZGlvTm9kZUxpc3QobmFt ZSkuZ2V0KCksIGNyZWF0aW9uQ29udGV4dCwgaXNvbGF0ZSk7CisgICAgcmV0dXJuIHRvVjgoY29s bGVjdGlvbi0+b3duZXJOb2RlKCktPnJhZGlvTm9kZUxpc3QobmFtZSkuZ2V0KCksIGNyZWF0aW9u Q29udGV4dCwgaXNvbGF0ZSk7CiB9CiAKIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOEhUTUxGb3Jt Q29udHJvbHNDb2xsZWN0aW9uOjpuYW1lZFByb3BlcnR5R2V0dGVyKHY4OjpMb2NhbDx2ODo6U3Ry aW5nPiBuYW1lLCBjb25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZvKQpJbmRleDogU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTE9wdGlvbnNDb2xsZWN0aW9uQ3VzdG9tLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1M T3B0aW9uc0NvbGxlY3Rpb25DdXN0b20uY3BwCShyZXZpc2lvbiAxMzY4MTEpCisrKyBTb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MT3B0aW9uc0NvbGxlY3Rpb25DdXN0b20u Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC04OCw3ICs4OCw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVl PiBWOEhUTUxPcHRpb25zQ29sbGUKIHsKICAgICBJTkNfU1RBVFMoIkRPTS5IVE1MT3B0aW9uc0Nv bGxlY3Rpb24ucmVtb3ZlKCkiKTsKICAgICBIVE1MT3B0aW9uc0NvbGxlY3Rpb24qIGltcCA9IFY4 SFRNTE9wdGlvbnNDb2xsZWN0aW9uOjp0b05hdGl2ZShhcmdzLkhvbGRlcigpKTsKLSAgICBIVE1M U2VsZWN0RWxlbWVudCogYmFzZSA9IHN0YXRpY19jYXN0PEhUTUxTZWxlY3RFbGVtZW50Kj4oaW1w LT5iYXNlKCkpOworICAgIEhUTUxTZWxlY3RFbGVtZW50KiBiYXNlID0gc3RhdGljX2Nhc3Q8SFRN TFNlbGVjdEVsZW1lbnQqPihpbXAtPm93bmVyTm9kZSgpKTsKICAgICByZXR1cm4gcmVtb3ZlRWxl bWVudChiYXNlLCBhcmdzKTsKIH0KIApAQCAtMTU1LDcgKzE1NSw3IEBAIHY4OjpIYW5kbGU8djg6 OlZhbHVlPiBWOEhUTUxPcHRpb25zQ29sbGUKIHsKICAgICBJTkNfU1RBVFMoIkRPTS5IVE1MT3B0 aW9uc0NvbGxlY3Rpb24uSW5kZXhlZFByb3BlcnR5U2V0dGVyIik7CiAgICAgSFRNTE9wdGlvbnND b2xsZWN0aW9uKiBjb2xsZWN0aW9uID0gVjhIVE1MT3B0aW9uc0NvbGxlY3Rpb246OnRvTmF0aXZl KGluZm8uSG9sZGVyKCkpOwotICAgIEhUTUxTZWxlY3RFbGVtZW50KiBiYXNlID0gc3RhdGljX2Nh c3Q8SFRNTFNlbGVjdEVsZW1lbnQqPihjb2xsZWN0aW9uLT5iYXNlKCkpOworICAgIEhUTUxTZWxl Y3RFbGVtZW50KiBiYXNlID0gc3RhdGljX2Nhc3Q8SFRNTFNlbGVjdEVsZW1lbnQqPihjb2xsZWN0 aW9uLT5vd25lck5vZGUoKSk7CiAgICAgcmV0dXJuIHRvT3B0aW9uc0NvbGxlY3Rpb25TZXR0ZXIo aW5kZXgsIHZhbHVlLCBiYXNlLCBpbmZvLkdldElzb2xhdGUoKSk7CiB9CiAKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2RvbS9XZWJLaXROYW1lZEZsb3cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2RvbS9XZWJLaXROYW1lZEZsb3cuY3BwCShyZXZpc2lvbiAxMzY4MTEpCisrKyBTb3Vy Y2UvV2ViQ29yZS9kb20vV2ViS2l0TmFtZWRGbG93LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjE2 LDcgKzIxNiw3IEBAIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIFdlYktpdE5hbWVkRmxvdzoKICAg ICByZXR1cm4gbV9mbG93TWFuYWdlci0+ZG9jdW1lbnQoKTsKIH0KIAotTm9kZSogV2ViS2l0TmFt ZWRGbG93OjpiYXNlKCkgY29uc3QKK05vZGUqIFdlYktpdE5hbWVkRmxvdzo6b3duZXJOb2RlKCkg Y29uc3QKIHsKICAgICByZXR1cm4gbV9mbG93TWFuYWdlci0+ZG9jdW1lbnQoKTsKIH0KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2RvbS9XZWJLaXROYW1lZEZsb3cuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9kb20vV2ViS2l0TmFtZWRGbG93LmgJKHJldmlzaW9uIDEzNjgxMSkKKysrIFNv dXJjZS9XZWJDb3JlL2RvbS9XZWJLaXROYW1lZEZsb3cuaAkod29ya2luZyBjb3B5KQpAQCAtNjcs NyArNjcsNyBAQCBwdWJsaWM6CiAKICAgICAvLyBUaGlzIGZ1bmN0aW9uIGlzIGNhbGxlZCBmcm9t IHRoZSBKUyBiaW5kaW5nIGNvZGUgdG8gZGV0ZXJtaW5lIGlmIHRoZSBOYW1lZEZsb3cgb2JqZWN0 IGlzIHJlYWNoYWJsZSBvciBub3QuCiAgICAgLy8gSWYgdGhlIG9iamVjdCBoYXMgbGlzdGVuZXJz LCB0aGUgb2JqZWN0IHNob3VsZCBvbmx5IGJlIGRpc2NhcmRlZCBpZiB0aGUgcGFyZW50IERvY3Vt ZW50IGlzIG5vdCByZWFjaGFibGUuCi0gICAgTm9kZSogYmFzZSgpIGNvbnN0OworICAgIE5vZGUq IG93bmVyTm9kZSgpIGNvbnN0OwogCiAgICAgdm9pZCBzZXRSZW5kZXJlcihSZW5kZXJOYW1lZEZs b3dUaHJlYWQqIHBhcmVudEZsb3dUaHJlYWQpOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20v V2ViS2l0TmFtZWRGbG93LmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vV2Vi S2l0TmFtZWRGbG93LmlkbAkocmV2aXNpb24gMTM2ODExKQorKysgU291cmNlL1dlYkNvcmUvZG9t L1dlYktpdE5hbWVkRmxvdy5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTMwLDcgKzMwLDcgQEAKIFsK ICAgICBFdmVudFRhcmdldCwKICAgICBKU0dlbmVyYXRlVG9KU09iamVjdCwKLSAgICBHZW5lcmF0 ZUlzUmVhY2hhYmxlPUltcGxCYXNlUm9vdAorICAgIEdlbmVyYXRlSXNSZWFjaGFibGU9SW1wbE93 bmVyTm9kZVJvb3QKIF0gaW50ZXJmYWNlIFdlYktpdE5hbWVkRmxvdyB7CiAgICAgcmVhZG9ubHkg YXR0cmlidXRlIERPTVN0cmluZyBuYW1lOwogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBib29sZWFu IG92ZXJzZXQ7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBbGxDb2xsZWN0aW9uLmlk bAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBbGxDb2xsZWN0aW9uLmlk bAkocmV2aXNpb24gMTM2ODExKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQWxsQ29sbGVj dGlvbi5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTI4LDcgKzI4LDcgQEAKICAgICBOYW1lZEdldHRl ciwKICAgICBDdXN0b21DYWxsLAogICAgIE1hc3F1ZXJhZGVzQXNVbmRlZmluZWQsCi0gICAgR2Vu ZXJhdGVJc1JlYWNoYWJsZT1JbXBsQmFzZVJvb3QsCisgICAgR2VuZXJhdGVJc1JlYWNoYWJsZT1J bXBsT3duZXJOb2RlUm9vdCwKICAgICBWOERlcGVuZGVudExpZmV0aW1lCiBdIGludGVyZmFjZSBI VE1MQWxsQ29sbGVjdGlvbiB7CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIHVuc2lnbmVkIGxvbmcg bGVuZ3RoOwpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ29sbGVjdGlvbi5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENvbGxlY3Rpb24uaAkocmV2aXNpb24g MTM2ODExKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ29sbGVjdGlvbi5oCSh3b3JraW5n IGNvcHkpCkBAIC02Miw3ICs2Miw2IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIGl0ZW0oMCkg JiYgIWl0ZW0oMSk7CiAgICAgfQogCi0gICAgTm9kZSogYmFzZSgpIGNvbnN0IHsgcmV0dXJuIG93 bmVyTm9kZSgpOyB9CiAgICAgdmlydHVhbCBFbGVtZW50KiB2aXJ0dWFsSXRlbUFmdGVyKHVuc2ln bmVkJiBvZmZzZXRJbkFycmF5LCBFbGVtZW50KikgY29uc3Q7CiAKIHByb3RlY3RlZDoKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENvbGxlY3Rpb24uaWRsCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTENvbGxlY3Rpb24uaWRsCShyZXZpc2lvbiAxMzY4MTEpCisr KyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDb2xsZWN0aW9uLmlkbAkod29ya2luZyBjb3B5KQpA QCAtMjIsNyArMjIsNyBAQAogICAgIEluZGV4ZWRHZXR0ZXIsCiAgICAgTmFtZWRHZXR0ZXIsCiAg ICAgQ3VzdG9tVG9KU09iamVjdCwKLSAgICBHZW5lcmF0ZUlzUmVhY2hhYmxlPUltcGxCYXNlUm9v dCwKKyAgICBHZW5lcmF0ZUlzUmVhY2hhYmxlPUltcGxPd25lck5vZGVSb290LAogICAgIFY4RGVw ZW5kZW50TGlmZXRpbWUsCiAgICAgT2JqQ1BvbHltb3JwaGljCiBdIGludGVyZmFjZSBIVE1MQ29s bGVjdGlvbiB7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGb3JtQ29udHJvbHNDb2xs ZWN0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGb3JtQ29u dHJvbHNDb2xsZWN0aW9uLmNwcAkocmV2aXNpb24gMTM2ODExKQorKysgU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MRm9ybUNvbnRyb2xzQ29sbGVjdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2 LDE1ICszNiwxNSBAQCB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwogLy8gU2luY2UgdGhlIGNv bGxlY3Rpb25zIGFyZSB0byBiZSAibGl2ZSIsIHdlIGhhdmUgdG8gZG8gdGhlCiAvLyBjYWxjdWxh dGlvbiBldmVyeSB0aW1lIGlmIGFueXRoaW5nIGhhcyBjaGFuZ2VkLgogCi1IVE1MRm9ybUNvbnRy b2xzQ29sbGVjdGlvbjo6SFRNTEZvcm1Db250cm9sc0NvbGxlY3Rpb24oTm9kZSogYmFzZSkKLSAg ICA6IEhUTUxDb2xsZWN0aW9uKGJhc2UsIEZvcm1Db250cm9scywgT3ZlcnJpZGVzSXRlbUFmdGVy KQorSFRNTEZvcm1Db250cm9sc0NvbGxlY3Rpb246OkhUTUxGb3JtQ29udHJvbHNDb2xsZWN0aW9u KE5vZGUqIG93bmVyTm9kZSkKKyAgICA6IEhUTUxDb2xsZWN0aW9uKG93bmVyTm9kZSwgRm9ybUNv bnRyb2xzLCBPdmVycmlkZXNJdGVtQWZ0ZXIpCiB7Ci0gICAgQVNTRVJUKGJhc2UtPmhhc1RhZ05h bWUoZm9ybVRhZykgfHwgYmFzZS0+aGFzVGFnTmFtZShmaWVsZHNldFRhZykpOworICAgIEFTU0VS VChvd25lck5vZGUtPmhhc1RhZ05hbWUoZm9ybVRhZykgfHwgb3duZXJOb2RlLT5oYXNUYWdOYW1l KGZpZWxkc2V0VGFnKSk7CiB9CiAKLVBhc3NSZWZQdHI8SFRNTEZvcm1Db250cm9sc0NvbGxlY3Rp b24+IEhUTUxGb3JtQ29udHJvbHNDb2xsZWN0aW9uOjpjcmVhdGUoTm9kZSogYmFzZSwgQ29sbGVj dGlvblR5cGUpCitQYXNzUmVmUHRyPEhUTUxGb3JtQ29udHJvbHNDb2xsZWN0aW9uPiBIVE1MRm9y bUNvbnRyb2xzQ29sbGVjdGlvbjo6Y3JlYXRlKE5vZGUqIG93bmVyTm9kZSwgQ29sbGVjdGlvblR5 cGUpCiB7Ci0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBIVE1MRm9ybUNvbnRyb2xzQ29sbGVjdGlv bihiYXNlKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBIVE1MRm9ybUNvbnRyb2xzQ29sbGVj dGlvbihvd25lck5vZGUpKTsKIH0KIAogSFRNTEZvcm1Db250cm9sc0NvbGxlY3Rpb246On5IVE1M Rm9ybUNvbnRyb2xzQ29sbGVjdGlvbigpCkBAIC01MywxOCArNTMsMTggQEAgSFRNTEZvcm1Db250 cm9sc0NvbGxlY3Rpb246On5IVE1MRm9ybUNvbgogCiBjb25zdCBWZWN0b3I8Rm9ybUFzc29jaWF0 ZWRFbGVtZW50Kj4mIEhUTUxGb3JtQ29udHJvbHNDb2xsZWN0aW9uOjpmb3JtQ29udHJvbEVsZW1l bnRzKCkgY29uc3QKIHsKLSAgICBBU1NFUlQoYmFzZSgpKTsKLSAgICBBU1NFUlQoYmFzZSgpLT5o YXNUYWdOYW1lKGZvcm1UYWcpIHx8IGJhc2UoKS0+aGFzVGFnTmFtZShmaWVsZHNldFRhZykpOwot ICAgIGlmIChiYXNlKCktPmhhc1RhZ05hbWUoZm9ybVRhZykpCi0gICAgICAgIHJldHVybiBzdGF0 aWNfY2FzdDxIVE1MRm9ybUVsZW1lbnQqPihiYXNlKCkpLT5hc3NvY2lhdGVkRWxlbWVudHMoKTsK LSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8SFRNTEZpZWxkU2V0RWxlbWVudCo+KGJhc2UoKSktPmFz c29jaWF0ZWRFbGVtZW50cygpOworICAgIEFTU0VSVChvd25lck5vZGUoKSk7CisgICAgQVNTRVJU KG93bmVyTm9kZSgpLT5oYXNUYWdOYW1lKGZvcm1UYWcpIHx8IG93bmVyTm9kZSgpLT5oYXNUYWdO YW1lKGZpZWxkc2V0VGFnKSk7CisgICAgaWYgKG93bmVyTm9kZSgpLT5oYXNUYWdOYW1lKGZvcm1U YWcpKQorICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8SFRNTEZvcm1FbGVtZW50Kj4ob3duZXJO b2RlKCkpLT5hc3NvY2lhdGVkRWxlbWVudHMoKTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8SFRN TEZpZWxkU2V0RWxlbWVudCo+KG93bmVyTm9kZSgpKS0+YXNzb2NpYXRlZEVsZW1lbnRzKCk7CiB9 CiAKIGNvbnN0IFZlY3RvcjxIVE1MSW1hZ2VFbGVtZW50Kj4mIEhUTUxGb3JtQ29udHJvbHNDb2xs ZWN0aW9uOjpmb3JtSW1hZ2VFbGVtZW50cygpIGNvbnN0CiB7Ci0gICAgQVNTRVJUKGJhc2UoKSk7 Ci0gICAgQVNTRVJUKGJhc2UoKS0+aGFzVGFnTmFtZShmb3JtVGFnKSk7Ci0gICAgcmV0dXJuIHN0 YXRpY19jYXN0PEhUTUxGb3JtRWxlbWVudCo+KGJhc2UoKSktPmltYWdlRWxlbWVudHMoKTsKKyAg ICBBU1NFUlQob3duZXJOb2RlKCkpOworICAgIEFTU0VSVChvd25lck5vZGUoKS0+aGFzVGFnTmFt ZShmb3JtVGFnKSk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PEhUTUxGb3JtRWxlbWVudCo+KG93 bmVyTm9kZSgpKS0+aW1hZ2VFbGVtZW50cygpOwogfQogCiBFbGVtZW50KiBIVE1MRm9ybUNvbnRy b2xzQ29sbGVjdGlvbjo6dmlydHVhbEl0ZW1BZnRlcih1bnNpZ25lZCYgb2Zmc2V0LCBFbGVtZW50 KiBwcmV2aW91c0l0ZW0pIGNvbnN0CkBAIC0xMTEsNyArMTExLDcgQEAgTm9kZSogSFRNTEZvcm1D b250cm9sc0NvbGxlY3Rpb246Om5hbWVkSQogICAgIC8vIGF0dHJpYnV0ZS4gSWYgYSBtYXRjaCBp cyBub3QgZm91bmQsIHRoZSBtZXRob2QgdGhlbiBzZWFyY2hlcyBmb3IgYW4KICAgICAvLyBvYmpl Y3Qgd2l0aCBhIG1hdGNoaW5nIG5hbWUgYXR0cmlidXRlLCBidXQgb25seSBvbiB0aG9zZSBlbGVt ZW50cwogICAgIC8vIHRoYXQgYXJlIGFsbG93ZWQgYSBuYW1lIGF0dHJpYnV0ZS4KLSAgICBjb25z dCBWZWN0b3I8SFRNTEltYWdlRWxlbWVudCo+KiBpbWFnZXNFbGVtZW50cyA9IGJhc2UoKS0+aGFz VGFnTmFtZShmaWVsZHNldFRhZykgPyAwIDogJmZvcm1JbWFnZUVsZW1lbnRzKCk7CisgICAgY29u c3QgVmVjdG9yPEhUTUxJbWFnZUVsZW1lbnQqPiogaW1hZ2VzRWxlbWVudHMgPSBvd25lck5vZGUo KS0+aGFzVGFnTmFtZShmaWVsZHNldFRhZykgPyAwIDogJmZvcm1JbWFnZUVsZW1lbnRzKCk7CiAg ICAgaWYgKEhUTUxFbGVtZW50KiBpdGVtID0gZmlyc3ROYW1lZEl0ZW0oZm9ybUNvbnRyb2xFbGVt ZW50cygpLCBpbWFnZXNFbGVtZW50cywgaWRBdHRyLCBuYW1lKSkKICAgICAgICAgcmV0dXJuIGl0 ZW07CiAKQEAgLTE0NCw3ICsxNDQsNyBAQCB2b2lkIEhUTUxGb3JtQ29udHJvbHNDb2xsZWN0aW9u Ojp1cGRhdGVOCiAgICAgICAgIH0KICAgICB9CiAKLSAgICBpZiAoYmFzZSgpLT5oYXNUYWdOYW1l KGZvcm1UYWcpKSB7CisgICAgaWYgKG93bmVyTm9kZSgpLT5oYXNUYWdOYW1lKGZvcm1UYWcpKSB7 CiAgICAgICAgIGNvbnN0IFZlY3RvcjxIVE1MSW1hZ2VFbGVtZW50Kj4mIGltYWdlRWxlbWVudHNB cnJheSA9IGZvcm1JbWFnZUVsZW1lbnRzKCk7CiAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7 IGkgPCBpbWFnZUVsZW1lbnRzQXJyYXkuc2l6ZSgpOyArK2kpIHsKICAgICAgICAgICAgIEhUTUxJ bWFnZUVsZW1lbnQqIGVsZW1lbnQgPSBpbWFnZUVsZW1lbnRzQXJyYXlbaV07CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxGb3JtQ29udHJvbHNDb2xsZWN0aW9uLmlkbAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGb3JtQ29udHJvbHNDb2xsZWN0aW9uLmlkbAko cmV2aXNpb24gMTM2ODExKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRm9ybUNvbnRyb2xz Q29sbGVjdGlvbi5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTIxLDcgKzIxLDcgQEAKIFsKICAgICBJ bmRleGVkR2V0dGVyLAogICAgIE5hbWVkR2V0dGVyLAotICAgIEdlbmVyYXRlSXNSZWFjaGFibGU9 SW1wbEJhc2VSb290LAorICAgIEdlbmVyYXRlSXNSZWFjaGFibGU9SW1wbE93bmVyTm9kZVJvb3Qs CiAgICAgVjhEZXBlbmRlbnRMaWZldGltZSwKIF0gaW50ZXJmYWNlIEhUTUxGb3JtQ29udHJvbHND b2xsZWN0aW9uIDogSFRNTENvbGxlY3Rpb24gewogICAgIFtDdXN0b21dIE5vZGUgbmFtZWRJdGVt KGluIFtPcHRpb25hbD1EZWZhdWx0SXNVbmRlZmluZWRdIERPTVN0cmluZyBuYW1lKTsKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE5hbWVDb2xsZWN0aW9uLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxOYW1lQ29sbGVjdGlvbi5jcHAJKHJldmlzaW9uIDEz NjgxMSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE5hbWVDb2xsZWN0aW9uLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNDEsOCArNDEsOCBAQCBIVE1MTmFtZUNvbGxlY3Rpb246OkhUTUxOYW1l Q29sbGVjdGlvbihOCiAKIEhUTUxOYW1lQ29sbGVjdGlvbjo6fkhUTUxOYW1lQ29sbGVjdGlvbigp CiB7Ci0gICAgQVNTRVJUKGJhc2UoKSk7Ci0gICAgQVNTRVJUKGJhc2UoKS0+aXNEb2N1bWVudE5v ZGUoKSk7CisgICAgQVNTRVJUKG93bmVyTm9kZSgpKTsKKyAgICBBU1NFUlQob3duZXJOb2RlKCkt PmlzRG9jdW1lbnROb2RlKCkpOwogICAgIEFTU0VSVCh0eXBlKCkgPT0gV2luZG93TmFtZWRJdGVt cyB8fCB0eXBlKCkgPT0gRG9jdW1lbnROYW1lZEl0ZW1zKTsKIAogICAgIG93bmVyTm9kZSgpLT5u b2RlTGlzdHMoKS0+cmVtb3ZlQ2FjaGVXaXRoQXRvbWljTmFtZSh0aGlzLCB0eXBlKCksIG1fbmFt ZSk7CkBAIC01MSwxNSArNTEsMTUgQEAgSFRNTE5hbWVDb2xsZWN0aW9uOjp+SFRNTE5hbWVDb2xs ZWN0aW9uKAogRWxlbWVudCogSFRNTE5hbWVDb2xsZWN0aW9uOjp2aXJ0dWFsSXRlbUFmdGVyKHVu c2lnbmVkJiBvZmZzZXRJbkFycmF5LCBFbGVtZW50KiBwcmV2aW91cykgY29uc3QKIHsKICAgICBB U1NFUlRfVU5VU0VEKG9mZnNldEluQXJyYXksICFvZmZzZXRJbkFycmF5KTsKLSAgICBBU1NFUlQo cHJldmlvdXMgIT0gYmFzZSgpKTsKKyAgICBBU1NFUlQocHJldmlvdXMgIT0gb3duZXJOb2RlKCkp OwogCiAgICAgTm9kZSogY3VycmVudDsKICAgICBpZiAoIXByZXZpb3VzKQotICAgICAgICBjdXJy ZW50ID0gYmFzZSgpLT5maXJzdENoaWxkKCk7CisgICAgICAgIGN1cnJlbnQgPSBvd25lck5vZGUo KS0+Zmlyc3RDaGlsZCgpOwogICAgIGVsc2UKLSAgICAgICAgY3VycmVudCA9IHByZXZpb3VzLT50 cmF2ZXJzZU5leHROb2RlKGJhc2UoKSk7CisgICAgICAgIGN1cnJlbnQgPSBwcmV2aW91cy0+dHJh dmVyc2VOZXh0Tm9kZShvd25lck5vZGUoKSk7CiAKLSAgICBmb3IgKDsgY3VycmVudDsgY3VycmVu dCA9IGN1cnJlbnQtPnRyYXZlcnNlTmV4dE5vZGUoYmFzZSgpKSkgeworICAgIGZvciAoOyBjdXJy ZW50OyBjdXJyZW50ID0gY3VycmVudC0+dHJhdmVyc2VOZXh0Tm9kZShvd25lck5vZGUoKSkpIHsK ICAgICAgICAgaWYgKCFjdXJyZW50LT5pc0VsZW1lbnROb2RlKCkpCiAgICAgICAgICAgICBjb250 aW51ZTsKICAgICAgICAgRWxlbWVudCogZSA9IHN0YXRpY19jYXN0PEVsZW1lbnQqPihjdXJyZW50 KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE9wdGlvbnNDb2xsZWN0aW9uLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPcHRpb25zQ29sbGVjdGlvbi5j cHAJKHJldmlzaW9uIDEzNjgxMSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE9wdGlvbnND b2xsZWN0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTgsNyArNTgsNyBAQCB2b2lkIEhUTUxP cHRpb25zQ29sbGVjdGlvbjo6YWRkKFBhc3NSZWZQCiAgICAgfQogCiAgICAgZWMgPSAwOwotICAg IEhUTUxTZWxlY3RFbGVtZW50KiBzZWxlY3QgPSB0b0hUTUxTZWxlY3RFbGVtZW50KGJhc2UoKSk7 CisgICAgSFRNTFNlbGVjdEVsZW1lbnQqIHNlbGVjdCA9IHRvSFRNTFNlbGVjdEVsZW1lbnQob3du ZXJOb2RlKCkpOwogCiAgICAgaWYgKGluZGV4ID09IC0xIHx8IHVuc2lnbmVkKGluZGV4KSA+PSBs ZW5ndGgoKSkKICAgICAgICAgc2VsZWN0LT5hZGQobmV3T3B0aW9uLCAwLCBlYyk7CkBAIC03MCwy MiArNzAsMjIgQEAgdm9pZCBIVE1MT3B0aW9uc0NvbGxlY3Rpb246OmFkZChQYXNzUmVmUAogCiB2 b2lkIEhUTUxPcHRpb25zQ29sbGVjdGlvbjo6cmVtb3ZlKGludCBpbmRleCkKIHsKLSAgICB0b0hU TUxTZWxlY3RFbGVtZW50KGJhc2UoKSktPnJlbW92ZShpbmRleCk7CisgICAgdG9IVE1MU2VsZWN0 RWxlbWVudChvd25lck5vZGUoKSktPnJlbW92ZShpbmRleCk7CiB9CiAKIGludCBIVE1MT3B0aW9u c0NvbGxlY3Rpb246OnNlbGVjdGVkSW5kZXgoKSBjb25zdAogewotICAgIHJldHVybiB0b0hUTUxT ZWxlY3RFbGVtZW50KGJhc2UoKSktPnNlbGVjdGVkSW5kZXgoKTsKKyAgICByZXR1cm4gdG9IVE1M U2VsZWN0RWxlbWVudChvd25lck5vZGUoKSktPnNlbGVjdGVkSW5kZXgoKTsKIH0KIAogdm9pZCBI VE1MT3B0aW9uc0NvbGxlY3Rpb246OnNldFNlbGVjdGVkSW5kZXgoaW50IGluZGV4KQogewotICAg IHRvSFRNTFNlbGVjdEVsZW1lbnQoYmFzZSgpKS0+c2V0U2VsZWN0ZWRJbmRleChpbmRleCk7Cisg ICAgdG9IVE1MU2VsZWN0RWxlbWVudChvd25lck5vZGUoKSktPnNldFNlbGVjdGVkSW5kZXgoaW5k ZXgpOwogfQogCiB2b2lkIEhUTUxPcHRpb25zQ29sbGVjdGlvbjo6c2V0TGVuZ3RoKHVuc2lnbmVk IGxlbmd0aCwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7Ci0gICAgdG9IVE1MU2VsZWN0RWxlbWVudChi YXNlKCkpLT5zZXRMZW5ndGgobGVuZ3RoLCBlYyk7CisgICAgdG9IVE1MU2VsZWN0RWxlbWVudChv d25lck5vZGUoKSktPnNldExlbmd0aChsZW5ndGgsIGVjKTsKIH0KIAogfSAvL25hbWVzcGFjZQpJ bmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MT3B0aW9uc0NvbGxlY3Rpb24uaWRsCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE9wdGlvbnNDb2xsZWN0aW9uLmlkbAko cmV2aXNpb24gMTM2ODExKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MT3B0aW9uc0NvbGxl Y3Rpb24uaWRsCSh3b3JraW5nIGNvcHkpCkBAIC0yMiw3ICsyMiw3IEBACiAgICAgSlNHZW5lcmF0 ZVRvTmF0aXZlT2JqZWN0LAogICAgIEN1c3RvbUluZGV4ZWRTZXR0ZXIsCiAgICAgTmFtZWRHZXR0 ZXIsCi0gICAgR2VuZXJhdGVJc1JlYWNoYWJsZT1JbXBsQmFzZVJvb3QsCisgICAgR2VuZXJhdGVJ c1JlYWNoYWJsZT1JbXBsT3duZXJOb2RlUm9vdCwKICAgICBWOERlcGVuZGVudExpZmV0aW1lLAog XSBpbnRlcmZhY2UgSFRNTE9wdGlvbnNDb2xsZWN0aW9uIDogSFRNTENvbGxlY3Rpb24gewogICAg IGF0dHJpYnV0ZSBsb25nIHNlbGVjdGVkSW5kZXg7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxQcm9wZXJ0aWVzQ29sbGVjdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MUHJvcGVydGllc0NvbGxlY3Rpb24uY3BwCShyZXZpc2lvbiAxMzY4MTEpCisr KyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQcm9wZXJ0aWVzQ29sbGVjdGlvbi5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTY2LDcgKzY2LDcgQEAgdm9pZCBIVE1MUHJvcGVydGllc0NvbGxlY3Rpb246 OnVwZGF0ZVJlZgogCiAgICAgbV9pdGVtUmVmRWxlbWVudHMuY2xlYXIoKTsKICAgICBzZXRJdGVt UmVmRWxlbWVudHNDYWNoZVZhbGlkKCk7Ci0gICAgdG9IVE1MRWxlbWVudChiYXNlKCkpLT5nZXRJ dGVtUmVmRWxlbWVudHMobV9pdGVtUmVmRWxlbWVudHMpOworICAgIHRvSFRNTEVsZW1lbnQob3du ZXJOb2RlKCkpLT5nZXRJdGVtUmVmRWxlbWVudHMobV9pdGVtUmVmRWxlbWVudHMpOwogfQogCiBz dGF0aWMgTm9kZSogbmV4dE5vZGVXaXRoUHJvcGVydHkoTm9kZSogcm9vdE5vZGUsIE5vZGUqIHBy ZXZpb3VzLCBOb2RlKiBvd25lck5vZGUpCkBAIC0xMzcsNyArMTM3LDcgQEAgUGFzc1JlZlB0cjxE T01TdHJpbmdMaXN0PiBIVE1MUHJvcGVydGllcwogCiBQYXNzUmVmUHRyPFByb3BlcnR5Tm9kZUxp c3Q+IEhUTUxQcm9wZXJ0aWVzQ29sbGVjdGlvbjo6bmFtZWRJdGVtKGNvbnN0IFN0cmluZyYgbmFt ZSkgY29uc3QKIHsKLSAgICByZXR1cm4gYmFzZSgpLT5wcm9wZXJ0eU5vZGVMaXN0KG5hbWUpOwor ICAgIHJldHVybiBvd25lck5vZGUoKS0+cHJvcGVydHlOb2RlTGlzdChuYW1lKTsKIH0KIAogYm9v bCBIVE1MUHJvcGVydGllc0NvbGxlY3Rpb246Omhhc05hbWVkSXRlbShjb25zdCBBdG9taWNTdHJp bmcmIG5hbWUpIGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUYWJsZVJvd3ND b2xsZWN0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUYWJs ZVJvd3NDb2xsZWN0aW9uLmNwcAkocmV2aXNpb24gMTM2ODExKQorKysgU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MVGFibGVSb3dzQ29sbGVjdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2Niw3 ICsxNjYsNyBAQCBFbGVtZW50KiBIVE1MVGFibGVSb3dzQ29sbGVjdGlvbjo6dmlydHVhCiB7CiAg ICAgQVNTRVJUX1VOVVNFRChvZmZzZXRJbkFycmF5LCAhb2Zmc2V0SW5BcnJheSk7CiAgICAgQVNT RVJUKCFwcmV2aW91cyB8fCAocHJldmlvdXMtPmlzSFRNTEVsZW1lbnQoKSAmJiB0b0hUTUxFbGVt ZW50KHByZXZpb3VzKS0+aGFzTG9jYWxOYW1lKHRyVGFnKSkpOwotICAgIHJldHVybiByb3dBZnRl cihzdGF0aWNfY2FzdDxIVE1MVGFibGVFbGVtZW50Kj4oYmFzZSgpKSwgc3RhdGljX2Nhc3Q8SFRN TFRhYmxlUm93RWxlbWVudCo+KHByZXZpb3VzKSk7CisgICAgcmV0dXJuIHJvd0FmdGVyKHN0YXRp Y19jYXN0PEhUTUxUYWJsZUVsZW1lbnQqPihvd25lck5vZGUoKSksIHN0YXRpY19jYXN0PEhUTUxU YWJsZVJvd0VsZW1lbnQqPihwcmV2aW91cykpOwogfQogCiB9Cg==