132610 2014-05-06 09:03:53 -0700 [Mac] make metadata cue attributes consistent 2014-05-06 13:20:04 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue glenn jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1006961 0 eric.carlson 2014-05-06 09:03:53 -0700 Not all versions of AVFoundation use the same attributes on AVMetadataItems, but our metadata cue should be consistent. 1006965 1 eric.carlson 2014-05-06 09:05:28 -0700 <rdar://problem/16696185> 1006980 2 230913 eric.carlson 2014-05-06 09:53:27 -0700 Created attachment 230913 Proposed patch. 1007061 3 230913 commit-queue 2014-05-06 13:20:00 -0700 Comment on attachment 230913 Proposed patch. Clearing flags on attachment: 230913 Committed r168377: <http://trac.webkit.org/changeset/168377> 1007062 4 commit-queue 2014-05-06 13:20:04 -0700 All reviewed patches have been landed. Closing bug. 230913 2014-05-06 09:53:27 -0700 2014-05-06 13:20:00 -0700 Proposed patch. patch_limit_extras_4.txt text/plain 12348 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2ODM1OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE0LTA1LTA2ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIG1ha2UgbWV0 YWRhdGEgY3VlIGF0dHJpYnV0ZXMgY29uc2lzdGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyNjEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCB1cGRhdGVkIGh0dHAvdGVzdHMv bWVkaWEvdHJhY2staW4tYmFuZC1obHMtbWV0YWRhdGEuaHRtbC4KKworICAgICAgICAqIHBsYXRm b3JtL21hYy9TZXJpYWxpemVkUGxhdGZvcm1SZXByZXNlbnRhdGlvbk1hYy5tbToKKyAgICAgICAg KFdlYkNvcmU6OmpzVmFsdWVXaXRoQVZNZXRhZGF0YUl0ZW1JbkNvbnRleHQpOiBEb24ndCBpbmNs dWRlIGtleXMgQGRhdGFUeXBlTmFtZXNwYWNlCisgICAgICAgICAgICBvciBAcGljdHVyZVR5cGUs IEBkYXRhVHlwZSAtPiBAdHlwZS4KKwogMjAxNC0wNS0wNiAgRGlyayBTY2h1bHplICA8a3JpdEB3 ZWJraXQub3JnPgogCiAgICAgICAgIFtTVkcyXSBTaGFyZSAib24iLSBldmVudCBhdHRyaWJ1dGVz IHdpdGggSFRNTEVsZW1lbnQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TZXJp YWxpemVkUGxhdGZvcm1SZXByZXNlbnRhdGlvbk1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2VyaWFsaXplZFBsYXRmb3JtUmVwcmVzZW50YXRpb25NYWMu bW0JKHJldmlzaW9uIDE2ODI4NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TZXJp YWxpemVkUGxhdGZvcm1SZXByZXNlbnRhdGlvbk1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMjE2 LDkgKzIxNiwxNyBAQCBzdGF0aWMgSlNWYWx1ZSAqanNWYWx1ZVdpdGhBVk1ldGFkYXRhSXRlCiAK ICAgICAgICAgaWYgKFtrZXkgaXNFcXVhbFRvU3RyaW5nOkAiTUlNRXR5cGUiXSkKICAgICAgICAg ICAgIGtleVN0cmluZyA9IEAidHlwZSI7Ci0gICAgICAgIGVsc2UgaWYgKFtrZXkgaXNFcXVhbFRv U3RyaW5nOkAiaW5mbyJdICYmIFt2YWx1ZSBpc0tpbmRPZkNsYXNzOltOU1N0cmluZyBjbGFzc11d ICYmICFbdmFsdWUgbGVuZ3RoXSkgewotICAgICAgICAgICAgLy8gQW4gImluZm8iIGtleSBpcyBh ZGRlZCB0byBhbGwgVFhYWCwgR0VPQiwgYW5kIEFQSUMgaXRlbXMgYnV0IHRoZSB2YWx1ZSBtYXkg YmUgZW1wdHkuCisgICAgICAgIGVsc2UgaWYgKFtrZXkgaXNFcXVhbFRvU3RyaW5nOkAiZGF0YVR5 cGVOYW1lc3BhY2UiXSB8fCBba2V5IGlzRXF1YWxUb1N0cmluZzpAInBpY3R1cmVUeXBlIl0pCiAg ICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgZWxzZSBpZiAoW2tleSBpc0VxdWFsVG9TdHJp bmc6QCJkYXRhVHlwZSJdKSB7CisgICAgICAgICAgICBpZCBkYXRhVHlwZU5hbWVzcGFjZSA9IFtl eHRyYXMgb2JqZWN0Rm9yS2V5OkAiZGF0YVR5cGVOYW1lc3BhY2UiXTsKKyAgICAgICAgICAgIGlm ICghZGF0YVR5cGVOYW1lc3BhY2UgfHwgIVtkYXRhVHlwZU5hbWVzcGFjZSBpc0tpbmRPZkNsYXNz OltOU1N0cmluZyBjbGFzc11dIHx8ICFbZGF0YVR5cGVOYW1lc3BhY2UgaXNFcXVhbFRvU3RyaW5n OkAib3JnLmlhbmEubWVkaWEtdHlwZSJdKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAg ICAgICAgICAga2V5U3RyaW5nID0gQCJ0eXBlIjsKKyAgICAgICAgfSBlbHNlIGlmIChbdmFsdWUg aXNLaW5kT2ZDbGFzczpbTlNTdHJpbmcgY2xhc3NdXSkgeworICAgICAgICAgICAgaWYgKCFbdmFs dWUgbGVuZ3RoXSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIGtleVN0 cmluZyA9IFtrZXkgbG93ZXJjYXNlU3RyaW5nXTsKICAgICAgICAgfQogCiAgICAgICAgIFtkaWN0 aW9uYXJ5IHNldE9iamVjdDp2YWx1ZSBmb3JLZXk6a2V5U3RyaW5nXTsKSW5kZXg6IExheW91dFRl c3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlz aW9uIDE2ODM1OSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDEzIEBACisyMDE0LTA1LTA2ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBw bGUuY29tPgorCisgICAgICAgIFtNYWNdIG1ha2UgbWV0YWRhdGEgY3VlIGF0dHJpYnV0ZXMgY29u c2lzdGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTMyNjEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBodHRwL3Rlc3RzL21lZGlhL3RyYWNrLWluLWJhbmQtaGxzLW1ldGFkYXRhLWV4cGVjdGVkLnR4 dDoKKyAgICAgICAgKiBodHRwL3Rlc3RzL21lZGlhL3RyYWNrLWluLWJhbmQtaGxzLW1ldGFkYXRh Lmh0bWw6CisKIDIwMTQtMDUtMDYgIERpcmsgU2NodWx6ZSAgPGtyaXRAd2Via2l0Lm9yZz4KIAog ICAgICAgICBbU1ZHMl0gU2hhcmUgIm9uIi0gZXZlbnQgYXR0cmlidXRlcyB3aXRoIEhUTUxFbGVt ZW50CkluZGV4OiBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL3RyYWNrLWluLWJhbmQtaGxz LW1ldGFkYXRhLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rl c3RzL21lZGlhL3RyYWNrLWluLWJhbmQtaGxzLW1ldGFkYXRhLWV4cGVjdGVkLnR4dAkocmV2aXNp b24gMTY4Mjg1KQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS90cmFjay1pbi1iYW5k LWhscy1tZXRhZGF0YS1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTMsNiArMyw4IEBA IFRlc3QgZm9yIG1ldGFkYXRhIHRyYWNrcyBmcm9tIEFwcGxlIEhMUyAKIAogCiAqKiBTZXQgdmlk ZW8uc3JjLCB3YWl0IGZvciBtZWRpYSBkYXRhIHRvIGxvYWQKK1JVTih2aWRlby5zcmMgPSAnaHR0 cDovLzEyNy4wLjAuMTo4MDAwL21lZGlhL3Jlc291cmNlcy9obHMvbWV0YWRhdGEvcHJvZ19pbmRl eC5tM3U4JykKKwogRVZFTlQoYWRkdHJhY2spCiBFWFBFQ1RFRCAodHJhY2tzLmxlbmd0aCA9PSAn MScpIE9LCiBSVU4odHJhY2sgPSB2aWRlby50ZXh0VHJhY2tzWzBdKQpAQCAtMTIsNiArMTQsNyBA QCBSVU4odHJhY2subW9kZSA9ICdoaWRkZW4nKQogRVZFTlQoY2FucGxheXRocm91Z2gpCiAKICoq IFN0YXJ0IHBsYXliYWNrLCB3YWl0IGZvciBhbGwgY3VlcyB0byBsb2FkCitSVU4odmlkZW8ucGxh eSgpKQogRVZFTlQoY3VlY2hhbmdlKQogRVZFTlQoY3VlY2hhbmdlKQogRVZFTlQoY3VlY2hhbmdl KQpAQCAtMjAsMzQgKzIzLDUwIEBAIEVWRU5UKGN1ZWNoYW5nZSkKIEVWRU5UKGN1ZWNoYW5nZSkK IAogKiogVmFsaWRhdGUgY3VlIGRhdGEKKyogMQogRVhQRUNURUQgKGN1ZS50eXBlID09ICdvcmcu aWQzJykgT0sKIEVYUEVDVEVEIChjdWUuZGF0YSA9PSAnbnVsbCcpIE9LCi1FWFBFQ1RFRCAoJ3si dmFsdWUiOnsia2V5IjoiVElUMiIsImRhdGEiOiJTdHJlYW0gQ291bnRpbmcifX0nID09ICd7InZh bHVlIjp7ImtleSI6IlRJVDIiLCJkYXRhIjoiU3RyZWFtIENvdW50aW5nIn19JykgT0sKK0VYUEVD VEVEIChjdWUudmFsdWUua2V5ID09ICciVElUMiInKSBPSworRVhQRUNURUQgKGN1ZS52YWx1ZS5k YXRhID09ICciU3RyZWFtIENvdW50aW5nIicpIE9LCiAKKyogMgogRVhQRUNURUQgKGN1ZS50eXBl ID09ICdvcmcuaWQzJykgT0sKIEVYUEVDVEVEIChjdWUuZGF0YSA9PSAnbnVsbCcpIE9LCi1FWFBF Q1RFRCAoJ3sidmFsdWUiOnsia2V5IjoiVFBFMSIsImRhdGEiOiJBbmR5In19JyA9PSAneyJ2YWx1 ZSI6eyJrZXkiOiJUUEUxIiwiZGF0YSI6IkFuZHkifX0nKSBPSworRVhQRUNURUQgKGN1ZS52YWx1 ZS5rZXkgPT0gJyJUUEUxIicpIE9LCitFWFBFQ1RFRCAoY3VlLnZhbHVlLmRhdGEgPT0gJyJBbmR5 IicpIE9LCiAKKyogMwogRVhQRUNURUQgKGN1ZS50eXBlID09ICdvcmcuaWQzJykgT0sKIEVYUEVD VEVEIChjdWUuZGF0YSA9PSAnbnVsbCcpIE9LCi1FWFBFQ1RFRCAoJ3sidmFsdWUiOnsia2V5Ijoi VEFMQiIsImRhdGEiOiJHcmVhdGVzdCBIaXRzIn19JyA9PSAneyJ2YWx1ZSI6eyJrZXkiOiJUQUxC IiwiZGF0YSI6IkdyZWF0ZXN0IEhpdHMifX0nKSBPSworRVhQRUNURUQgKGN1ZS52YWx1ZS5rZXkg PT0gJyJUQUxCIicpIE9LCitFWFBFQ1RFRCAoY3VlLnZhbHVlLmRhdGEgPT0gJyJHcmVhdGVzdCBI aXRzIicpIE9LCiAKKyogNAogRVhQRUNURUQgKGN1ZS50eXBlID09ICdvcmcuaWQzJykgT0sKIEVY UEVDVEVEIChjdWUuZGF0YSA9PSAnbnVsbCcpIE9LCi1FWFBFQ1RFRCAoJ3sidmFsdWUiOnsiZGF0 YSI6e30sImluZm8iOiJPdXIgSGVybyIsImtleSI6IkdFT0IiLCJuYW1lIjoiYWJlLnBuZyIsInR5 cGUiOiJpbWFnZS9wbmcifX0nID09ICd7InZhbHVlIjp7ImRhdGEiOnt9LCJpbmZvIjoiT3VyIEhl cm8iLCJrZXkiOiJHRU9CIiwibmFtZSI6ImFiZS5wbmciLCJ0eXBlIjoiaW1hZ2UvcG5nIn19Jykg T0sKK0VYUEVDVEVEIChjdWUudmFsdWUua2V5ID09ICciR0VPQiInKSBPSworRVhQRUNURUQgKGN1 ZS52YWx1ZS5kYXRhID09ICd7fScpIE9LCitFWFBFQ1RFRCAoY3VlLnZhbHVlLnR5cGUgPT0gJyJp bWFnZS9wbmciJykgT0sKK0VYUEVDVEVEIChjdWUudmFsdWUuaW5mbyA9PSAnIk91ciBIZXJvIicp IE9LCitFWFBFQ1RFRCAoY3VlLnZhbHVlLm5hbWUgPT0gJyJhYmUucG5nIicpIE9LCiAKKyogNQog RVhQRUNURUQgKGN1ZS50eXBlID09ICdvcmcuaWQzJykgT0sKIEVYUEVDVEVEIChjdWUuZGF0YSA9 PSAnbnVsbCcpIE9LCi1FWFBFQ1RFRCAoJ3sidmFsdWUiOnsiZGF0YSI6e30sImtleSI6IkFQSUMi LCJ0eXBlIjoiaW1hZ2UvcG5nIiwiZGF0YVR5cGUiOiJNb3ZpZS92aWRlbyBzY3JlZW4gY2FwdHVy ZSJ9fScgPT0gJ3sidmFsdWUiOnsiZGF0YSI6e30sImtleSI6IkFQSUMiLCJ0eXBlIjoiaW1hZ2Uv cG5nIiwiZGF0YVR5cGUiOiJNb3ZpZS92aWRlbyBzY3JlZW4gY2FwdHVyZSJ9fScpIE9LCitFWFBF Q1RFRCAoY3VlLnZhbHVlLmtleSA9PSAnIkFQSUMiJykgT0sKK0VYUEVDVEVEIChjdWUudmFsdWUu ZGF0YSA9PSAne30nKSBPSworRVhQRUNURUQgKGN1ZS52YWx1ZS50eXBlID09ICciaW1hZ2UvcG5n IicpIE9LCiAKKyogNgogRVhQRUNURUQgKGN1ZS50eXBlID09ICdvcmcuaWQzJykgT0sKIEVYUEVD VEVEIChjdWUuZGF0YSA9PSAnbnVsbCcpIE9LCi1FWFBFQ1RFRCAoJ3sidmFsdWUiOnsia2V5Ijoi VFhYWCIsImRhdGEiOiJUZXh0IEJsb2IifX0nID09ICd7InZhbHVlIjp7ImtleSI6IlRYWFgiLCJk YXRhIjoiVGV4dCBCbG9iIn19JykgT0sKK0VYUEVDVEVEIChjdWUudmFsdWUua2V5ID09ICciVFhY WCInKSBPSworRVhQRUNURUQgKGN1ZS52YWx1ZS5kYXRhID09ICciVGV4dCBCbG9iIicpIE9LCiAK ICoqIEV4dHJhY3QgaW1hZ2VzIGZyb20gY3VlIGRhdGEsIHZhbGlkYXRlIGJ5IHNldHRpbmcgaW1n LnNyYwogUlVOKGN1ZUltYWdlRGF0YSA9IHRyYWNrLmN1ZXNbM10udmFsdWUuZGF0YSkKIEVYUEVD VEVEIChjdWVJbWFnZURhdGEgaW5zdGFuY2VvZiBBcnJheUJ1ZmZlciA9PSAndHJ1ZScpIE9LCi1S VU4oYmxvYlVybCA9IFVSTC5jcmVhdGVPYmplY3RVUkwobmV3IEJsb2IoW2N1ZUltYWdlRGF0YV0s IHsgdHlwZTogJ2ltYWdlL3BuZycgfSApKSkKK1JVTihibG9iVXJsID0gVVJMLmNyZWF0ZU9iamVj dFVSTChuZXcgQmxvYihbY3VlSW1hZ2VEYXRhXSwgeyB0eXBlOiAnaW1hZ2UvcG5nJyB9KSkpCiBS VU4oaW1hZ2VFbGVtZW50LnNyYyA9IGJsb2JVcmwpCiBFVkVOVChsb2FkKQogRVhQRUNURUQgKGlt YWdlRWxlbWVudC53aWR0aCA9PSAnNzYnKSBPSwpAQCAtNTUsNyArNzQsNyBAQCBFWFBFQ1RFRCAo aW1hZ2VFbGVtZW50LmhlaWdodCA9PSAnMTAzJykgCiAKIFJVTihjdWVJbWFnZURhdGEgPSB0cmFj ay5jdWVzWzRdLnZhbHVlLmRhdGEpCiBFWFBFQ1RFRCAoY3VlSW1hZ2VEYXRhIGluc3RhbmNlb2Yg QXJyYXlCdWZmZXIgPT0gJ3RydWUnKSBPSwotUlVOKGJsb2JVcmwgPSBVUkwuY3JlYXRlT2JqZWN0 VVJMKG5ldyBCbG9iKFtjdWVJbWFnZURhdGFdLCB7IHR5cGU6ICdpbWFnZS9wbmcnIH0gKSkpCitS VU4oYmxvYlVybCA9IFVSTC5jcmVhdGVPYmplY3RVUkwobmV3IEJsb2IoW2N1ZUltYWdlRGF0YV0s IHsgdHlwZTogJ2ltYWdlL3BuZycgfSkpKQogUlVOKGltYWdlRWxlbWVudC5zcmMgPSBibG9iVXJs KQogRVZFTlQobG9hZCkKIEVYUEVDVEVEIChpbWFnZUVsZW1lbnQud2lkdGggPT0gJzEwMCcpIE9L CkluZGV4OiBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL3RyYWNrLWluLWJhbmQtaGxzLW1l dGFkYXRhLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS90 cmFjay1pbi1iYW5kLWhscy1tZXRhZGF0YS5odG1sCShyZXZpc2lvbiAxNjgyODUpCisrKyBMYXlv dXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL3RyYWNrLWluLWJhbmQtaGxzLW1ldGFkYXRhLmh0bWwJ KHdvcmtpbmcgY29weSkKQEAgLTEwLDEzICsxMCwxMyBAQAogICAgICAgICAgICAgdmFyIHRyYWNr OwogICAgICAgICAgICAgdmFyIGN1ZWNoYW5nZUNvdW50ID0gMDsKICAgICAgICAgICAgIHZhciBs b2FkQ291bnQgPSAwOwotICAgICAgICAgICAgdmFyIGN1ZUpTT04gPSBbCi0gICAgICAgICAgICAg ICAgICd7InZhbHVlIjp7ImtleSI6IlRJVDIiLCJkYXRhIjoiU3RyZWFtIENvdW50aW5nIn19JywK LSAgICAgICAgICAgICAgICAgJ3sidmFsdWUiOnsia2V5IjoiVFBFMSIsImRhdGEiOiJBbmR5In19 JywKLSAgICAgICAgICAgICAgICAgJ3sidmFsdWUiOnsia2V5IjoiVEFMQiIsImRhdGEiOiJHcmVh dGVzdCBIaXRzIn19JywKLSAgICAgICAgICAgICAgICAgJ3sidmFsdWUiOnsiZGF0YSI6e30sImlu Zm8iOiJPdXIgSGVybyIsImtleSI6IkdFT0IiLCJuYW1lIjoiYWJlLnBuZyIsInR5cGUiOiJpbWFn ZS9wbmcifX0nLAotICAgICAgICAgICAgICAgICAneyJ2YWx1ZSI6eyJkYXRhIjp7fSwia2V5Ijoi QVBJQyIsInR5cGUiOiJpbWFnZS9wbmciLCJkYXRhVHlwZSI6Ik1vdmllL3ZpZGVvIHNjcmVlbiBj YXB0dXJlIn19JywKLSAgICAgICAgICAgICAgICAgJ3sidmFsdWUiOnsia2V5IjoiVFhYWCIsImRh dGEiOiJUZXh0IEJsb2IifX0nCisgICAgICAgICAgICB2YXIgY3VlRGF0YSA9IFsKKyAgICAgICAg ICAgICAgICAgeyJrZXkiIDogIlRJVDIiLCAiZGF0YSIgOiAiU3RyZWFtIENvdW50aW5nIn0sCisg ICAgICAgICAgICAgICAgIHsia2V5IiA6ICJUUEUxIiwgImRhdGEiIDogIkFuZHkifSwKKyAgICAg ICAgICAgICAgICAgeyJrZXkiIDogIlRBTEIiLCAiZGF0YSIgOiAiR3JlYXRlc3QgSGl0cyJ9LAor ICAgICAgICAgICAgICAgICB7ImtleSIgOiAiR0VPQiIsICJkYXRhIiA6IHt9LCAidHlwZSIgOiAi aW1hZ2UvcG5nIiwgImluZm8iIDogIk91ciBIZXJvIiwgIm5hbWUiIDogImFiZS5wbmcifSwKKyAg ICAgICAgICAgICAgICAgeyJrZXkiIDogIkFQSUMiLCAiZGF0YSIgOiB7fSwgInR5cGUiIDogImlt YWdlL3BuZyJ9LAorICAgICAgICAgICAgICAgICB7ImtleSIgOiAiVFhYWCIsICJkYXRhIiA6ICJU ZXh0IEJsb2IifSwKICAgICAgICAgICAgIF07CiAgICAgICAgICAgICB2YXIgaW1hZ2VTaXplcyA9 IFsgWzc2LCAxMDNdLCBbMTAwLCAxMDBdIF07CiAgICAgICAgIApAQCAtMzAsNyArMzAsNyBAQAog ICAgICAgICAgICAgICAgIHJ1bigidHJhY2subW9kZSA9ICdoaWRkZW4nIik7CiAgICAgICAgICAg ICAgICAgdHJhY2suYWRkRXZlbnRMaXN0ZW5lcignY3VlY2hhbmdlJywgY3VlY2hhbmdlLCB0cnVl KTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIAorCiAgICAgICAgICAgICBmdW5jdGlvbiBp bWFnZUxvYWQoKQogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgi aW1hZ2VFbGVtZW50LndpZHRoIiwgaW1hZ2VTaXplc1tsb2FkQ291bnRdWzBdKTsKQEAgLTQ5LDMw ICs0OSw1MyBAQAogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIHJ1bigiY3VlSW1hZ2VE YXRhID0gdHJhY2suY3Vlc1siICsgY3VlSW5kZXggKyAiXS52YWx1ZS5kYXRhIik7CiAgICAgICAg ICAgICAgICAgdGVzdEV4cGVjdGVkKCJjdWVJbWFnZURhdGEgaW5zdGFuY2VvZiBBcnJheUJ1ZmZl ciIsIHRydWUpOwotICAgICAgICAgICAgICAgIHJ1bigiYmxvYlVybCA9IFVSTC5jcmVhdGVPYmpl Y3RVUkwobmV3IEJsb2IoW2N1ZUltYWdlRGF0YV0sIHsgdHlwZTogJ2ltYWdlL3BuZycgfSApKSIp OworICAgICAgICAgICAgICAgIHJ1bigiYmxvYlVybCA9IFVSTC5jcmVhdGVPYmplY3RVUkwobmV3 IEJsb2IoW2N1ZUltYWdlRGF0YV0sIHsgdHlwZTogJ2ltYWdlL3BuZycgfSkpIik7CiAgICAgICAg ICAgICAgICAgaW1hZ2VFbGVtZW50ID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvcigiI3Bob3RvIik7 CiAgICAgICAgICAgICAgICAgcnVuKCJpbWFnZUVsZW1lbnQuc3JjID0gYmxvYlVybCIpOwogICAg ICAgICAgICAgfQotICAgICAgICAgICAgCisKKyAgICAgICAgICAgIGZ1bmN0aW9uIGNvbXBhcmVD dWVzKG9ic2VydmVkLCBleHBlY3RlZCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAv LyBNYWtlIGEgbXV0YWJsZSBjb3B5IG9mIHRoZSBjdWUgc28gd2UgY2FuIHJlbW92ZSBhdHRyaWJ1 dGVzIGFzIHRoZXkgYXJlIHByb2Nlc3NlZC4KKyAgICAgICAgICAgICAgICBvYnNlcnZlZCA9IEpT T04ucGFyc2UoSlNPTi5zdHJpbmdpZnkob2JzZXJ2ZWQpKTsKKyAgICAgICAgICAgICAgICBmb3Ig KHByb3BlcnR5IGluIGV4cGVjdGVkKSB7CisgICAgICAgICAgICAgICAgICAgIG9ic2VydmVkVmFs dWUgPSBvYnNlcnZlZFtwcm9wZXJ0eV07CisgICAgICAgICAgICAgICAgICAgIGV4cGVjdGVkVmFs dWUgPSBleHBlY3RlZFtwcm9wZXJ0eV07CisgICAgICAgICAgICAgICAgICAgIGN1ZS52YWx1ZVtw cm9wZXJ0eV0gPSBvYnNlcnZlZFZhbHVlOworCisgICAgICAgICAgICAgICAgICAgIG9ic2VydmVk VmFsdWUgPSBKU09OLnN0cmluZ2lmeShvYnNlcnZlZFZhbHVlKTsKKyAgICAgICAgICAgICAgICAg ICAgZXhwZWN0ZWRWYWx1ZSA9IEpTT04uc3RyaW5naWZ5KGV4cGVjdGVkVmFsdWUpOworICAgICAg ICAgICAgICAgICAgICByZXBvcnRFeHBlY3RlZChvYnNlcnZlZFZhbHVlID09IGV4cGVjdGVkVmFs dWUsICJjdWUudmFsdWUuIiArIHByb3BlcnR5LCAiPT0iLCBleHBlY3RlZFZhbHVlLCBvYnNlcnZl ZFZhbHVlKTsKKyAgICAgICAgICAgICAgICAgICAgZGVsZXRlIG9ic2VydmVkW3Byb3BlcnR5XTsK KyAgICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICBmb3IgKHByb3BlcnR5IGluIG9i c2VydmVkKSB7CisgICAgICAgICAgICAgICAgICAgIG9ic2VydmVkTmFtZSA9IHByb3BlcnR5Owor ICAgICAgICAgICAgICAgICAgICBvYnNlcnZlZFZhbHVlID0gb2JzZXJ2ZWRbcHJvcGVydHldOwor ICAgICAgICAgICAgICAgICAgICBsb2dSZXN1bHQoRmFpbGVkLCAiRXJyb3I6IHVuZXhwZWN0ZWQg Y3VlIHByb3BlcnR5IDxlbT5jdWUudmFsdWUuIiArIG9ic2VydmVkTmFtZSArICI8L2VtPiA9IDxl bT4nIiArIG9ic2VydmVkVmFsdWUgKyAiJzwvZW0+ICIpOworICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIH0KKwogICAgICAgICAgICAgZnVuY3Rpb24gY3VlY2hhbmdlKGV2ZW50KQogICAg ICAgICAgICAgewogICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiRVZFTlQoY3VlY2hhbmdl KSIpOwogICAgICAgICAgICAgICAgIGlmICgrK2N1ZWNoYW5nZUNvdW50ICE9IDYpCiAgICAgICAg ICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiPGJy PjxpPioqIFZhbGlkYXRlIGN1ZSBkYXRhPC9pPiIpOworICAgICAgICAgICAgICAgIGNvbnNvbGVX cml0ZSgiPGJyPjxlbT4qKiBWYWxpZGF0ZSBjdWUgZGF0YTwvZW0+Iik7CiAgICAgICAgICAgICAg ICAgdHJhY2sucmVtb3ZlRXZlbnRMaXN0ZW5lcigiY3VlY2hhbmdlIiwgY3VlY2hhbmdlLCB0cnVl KTsKICAgICAgICAgICAgICAgICB2aWRlby5wYXVzZSgpOwotICAgICAgICAgICAgICAgIAorCiAg ICAgICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCA2OyBpKyspIHsKKyAgICAgICAgICAg ICAgICAgICAgY29uc29sZVdyaXRlKCI8ZW0+KiAiICsgKGkgKyAxKSArICI8L2VtPiIpOwogICAg ICAgICAgICAgICAgICAgICBjdWUgPSB0cmFjay5jdWVzW2ldOwogICAgICAgICAgICAgICAgICAg ICB0ZXN0RXhwZWN0ZWQoImN1ZS50eXBlIiwgIm9yZy5pZDMiKTsKICAgICAgICAgICAgICAgICAg ICAgdGVzdEV4cGVjdGVkKCJjdWUuZGF0YSIsIG51bGwpOwotICAgICAgICAgICAgICAgICAgICB0 ZXN0RXhwZWN0ZWQoIiciICsgSlNPTi5zdHJpbmdpZnkoY3VlKSArICInIiwgY3VlSlNPTltpXSk7 CisgICAgICAgICAgICAgICAgICAgIGNvbXBhcmVDdWVzKGN1ZS52YWx1ZSwgY3VlRGF0YVtpXSk7 CiAgICAgICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CiAgICAgICAgICAgICAgICAg fQogCi0gICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8aT4qKiBFeHRyYWN0IGltYWdlcyBm cm9tIGN1ZSBkYXRhLCB2YWxpZGF0ZSBieSBzZXR0aW5nIGltZy5zcmM8L2k+Iik7CisgICAgICAg ICAgICAgICAgY29uc29sZVdyaXRlKCI8ZW0+KiogRXh0cmFjdCBpbWFnZXMgZnJvbSBjdWUgZGF0 YSwgdmFsaWRhdGUgYnkgc2V0dGluZyBpbWcuc3JjPC9lbT4iKTsKICAgICAgICAgICAgICAgICBp bWFnZUVsZW1lbnQgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCIjcGhvdG8iKTsKICAgICAgICAg ICAgICAgICB3YWl0Rm9yRXZlbnQoJ2xvYWQnLCBpbWFnZUxvYWQsIGZhbHNlLCBmYWxzZSwgaW1h Z2VFbGVtZW50KQogICAgICAgICAgICAgICAgIHRlc3RJbWFnZSgzKTsKQEAgLTgwLDE2ICsxMDMs MTcgQEAKIAogICAgICAgICAgICAgZnVuY3Rpb24gY2FucGxheXRocm91Z2goKQogICAgICAgICAg ICAgewotICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiPGJyPjxpPioqIFN0YXJ0IHBsYXli YWNrLCB3YWl0IGZvciBhbGwgY3VlcyB0byBsb2FkPC9pPiIpOwotICAgICAgICAgICAgICAgIHZp ZGVvLnBsYXkoKTsgCisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8YnI+PGVtPioqIFN0 YXJ0IHBsYXliYWNrLCB3YWl0IGZvciBhbGwgY3VlcyB0byBsb2FkPC9lbT4iKTsKKyAgICAgICAg ICAgICAgICBydW4oInZpZGVvLnBsYXkoKSIpOyAKICAgICAgICAgICAgIH0KIAogICAgICAgICAg ICAgZnVuY3Rpb24gc3RhcnQoKQogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIGNvbnNv bGVXcml0ZSgiPGJyPjxpPioqIFNldCB2aWRlby5zcmMsIHdhaXQgZm9yIG1lZGlhIGRhdGEgdG8g bG9hZDwvaT4iKTsKKyAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIjxicj48ZW0+KiogU2V0 IHZpZGVvLnNyYywgd2FpdCBmb3IgbWVkaWEgZGF0YSB0byBsb2FkPC9lbT4iKTsKICAgICAgICAg ICAgICAgICBmaW5kTWVkaWFFbGVtZW50KCk7Ci0gICAgICAgICAgICAgICAgdmlkZW8uc3JjID0g Imh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9tZWRpYS9yZXNvdXJjZXMvaGxzL21ldGFkYXRhL3Byb2df aW5kZXgubTN1OCI7CisgICAgICAgICAgICAgICAgcnVuKCJ2aWRlby5zcmMgPSAnaHR0cDovLzEy Ny4wLjAuMTo4MDAwL21lZGlhL3Jlc291cmNlcy9obHMvbWV0YWRhdGEvcHJvZ19pbmRleC5tM3U4 JyIpOwogCisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCIiKTsKICAgICAgICAgICAgICAg ICB3YWl0Rm9yRXZlbnQoImNhbnBsYXl0aHJvdWdoIiwgY2FucGxheXRocm91Z2gpOwogICAgICAg ICAgICAgICAgIHdhaXRGb3JFdmVudCgnYWRkdHJhY2snLCBhZGR0cmFjaywgZmFsc2UsIGZhbHNl LCB2aWRlby50ZXh0VHJhY2tzKTsKICAgICAgICAgICAgIH0K