153867 2016-02-04 08:00:39 -0800 Don't discard in-band cues with negative start times 2016-02-04 10:21:48 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue webkit-bug-importer oldest_to_newest 1161982 0 eric.carlson 2016-02-04 08:00:39 -0800 In-band cues at the beginning of a media file may be delivered with an apparently negative start times. Use a time of zero instead of discarding the cue entirely. 1161984 1 eric.carlson 2016-02-04 08:01:29 -0800 <rdar://problem/19588632> 1161996 2 270661 eric.carlson 2016-02-04 09:00:51 -0800 Created attachment 270661 Proposed patch 1162026 3 eric.carlson 2016-02-04 10:21:39 -0800 Committed r196131: https://trac.webkit.org/r196131 270661 2016-02-04 09:00:51 -0800 2016-02-04 10:21:48 -0800 Proposed patch broken_test_patch_2.txt text/plain 12538 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NjEyMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE2LTAyLTA0ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIERvbid0IGRpc2NhcmQg aW4tYmFuZCBjdWVzIHdpdGggbmVnYXRpdmUgc3RhcnQgdGltZXMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1Mzg2NworICAgICAgICA8cmRhcjovL3By b2JsZW0vMTk1ODg2MzI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgTm8gbmV3IHRlc3RzLCB1cGRhdGVkIGFuZCB1bi1za2lwcGVkIGh0dHAvdGVzdHMv bWVkaWEvdHJhY2staW4tYmFuZC1obHMtbWV0YWRhdGEuaHRtbC4KKworICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9JbmJhbmRNZXRhZGF0YVRleHRUcmFja1ByaXZhdGVB VkYuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5iYW5kTWV0YWRhdGFUZXh0VHJhY2tQcml2YXRl QVZGOjphZGREYXRhQ3VlKTogIEFTU0VSVCBpZiBwYXNzZWQgbmVnYXRpdmUgdGltZSB2YWx1ZS4K KyAgICAgICAgKFdlYkNvcmU6OkluYmFuZE1ldGFkYXRhVGV4dFRyYWNrUHJpdmF0ZUFWRjo6dXBk YXRlUGVuZGluZ0N1ZUVuZFRpbWVzKTogRGl0dG8uIENvcnJlY3QgbG9nZ2luZy4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZh dGVBVkZvdW5kYXRpb25PYmpDOjpwcm9jZXNzQ3VlKTogQVNTRVJUIGlmIHBhc3NlZCBuZWdhdGl2 ZSB0aW1lIHZhbHVlLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3Vu ZGF0aW9uT2JqQzo6bWV0YWRhdGFEaWRBcnJpdmUpOiBDb252ZXJ0IG5lZ2F0aXZlIGN1ZSB0aW1l cyB0byB6ZXJvLgorICAgICAgICAoLVtXZWJDb3JlQVZGTW92aWVPYnNlcnZlciBsZWdpYmxlT3V0 cHV0OmRpZE91dHB1dEF0dHJpYnV0ZWRTdHJpbmdzOm5hdGl2ZVNhbXBsZUJ1ZmZlcnM6Zm9ySXRl bVRpbWU6XSk6CisgICAgICAgICAgRGl0dG8uCisKIDIwMTYtMDItMDQgIFlvdWVubiBGYWJsZXQg IDx5b3Vlbm4uZmFibGV0QGNyZi5jYW5vbi5mcj4KIAogICAgICAgICBVbnJldmlld2VkLgpJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0luYmFuZE1l dGFkYXRhVGV4dFRyYWNrUHJpdmF0ZUFWRi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0luYmFuZE1ldGFkYXRhVGV4dFRyYWNr UHJpdmF0ZUFWRi5jcHAJKHJldmlzaW9uIDE5NjAxMSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9JbmJhbmRNZXRhZGF0YVRleHRUcmFja1ByaXZhdGVB VkYuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Nyw2ICs1Nyw4IEBAIEluYmFuZE1ldGFkYXRhVGV4 dFRyYWNrUHJpdmF0ZUFWRjo6fkluYmEKIHZvaWQgSW5iYW5kTWV0YWRhdGFUZXh0VHJhY2tQcml2 YXRlQVZGOjphZGREYXRhQ3VlKGNvbnN0IE1lZGlhVGltZSYgc3RhcnQsIGNvbnN0IE1lZGlhVGlt ZSYgZW5kLCBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRQbGF0Zm9ybVJlcHJlc2VudGF0aW9uPiBwcnBD dWVEYXRhLCBjb25zdCBTdHJpbmcmIHR5cGUpCiB7CiAgICAgQVNTRVJUKGN1ZUZvcm1hdCgpID09 IERhdGEpOworICAgIEFTU0VSVChzdGFydCA+PSBNZWRpYVRpbWU6Onplcm9UaW1lKCkpOworCiAg ICAgaWYgKCFjbGllbnQoKSkKICAgICAgICAgcmV0dXJuOwogCkBAIC02OSwxNSArNzEsMTcgQEAg dm9pZCBJbmJhbmRNZXRhZGF0YVRleHRUcmFja1ByaXZhdGVBVkY6OgogCiB2b2lkIEluYmFuZE1l dGFkYXRhVGV4dFRyYWNrUHJpdmF0ZUFWRjo6dXBkYXRlUGVuZGluZ0N1ZUVuZFRpbWVzKGNvbnN0 IE1lZGlhVGltZSYgdGltZSkKIHsKKyAgICBBU1NFUlQodGltZSA+PSBNZWRpYVRpbWU6Onplcm9U aW1lKCkpOworCiAgICAgaWYgKHRpbWUgPj0gbV9jdXJyZW50Q3VlU3RhcnRUaW1lKSB7CiAgICAg ICAgIGlmIChjbGllbnQoKSkgewogICAgICAgICAgICAgZm9yIChhdXRvJiBwYXJ0aWFsQ3VlIDog bV9pbmNvbXBsZXRlQ3VlcykgewotICAgICAgICAgICAgICAgIExPRyhNZWRpYSwgIkluYmFuZE1l dGFkYXRhVGV4dFRyYWNrUHJpdmF0ZUFWRjo6YWRkRGF0YUN1ZSglcCkgLSB1cGRhdGluZyBjdWU6 IHN0YXJ0PSVzLCBlbmQ9JXMiLCB0aGlzLCB0b1N0cmluZyhwYXJ0aWFsQ3VlLnN0YXJ0VGltZSku dXRmOCgpLmRhdGEoKSwgdG9TdHJpbmcodGltZSkudXRmOCgpLmRhdGEoKSk7CisgICAgICAgICAg ICAgICAgTE9HKE1lZGlhLCAiSW5iYW5kTWV0YWRhdGFUZXh0VHJhY2tQcml2YXRlQVZGOjp1cGRh dGVQZW5kaW5nQ3VlRW5kVGltZXMoJXApIC0gdXBkYXRpbmcgY3VlOiBzdGFydD0lcywgZW5kPSVz IiwgdGhpcywgdG9TdHJpbmcocGFydGlhbEN1ZS5zdGFydFRpbWUpLnV0ZjgoKS5kYXRhKCksIHRv U3RyaW5nKHRpbWUpLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICAgICAgICAgIGNsaWVudCgpLT51 cGRhdGVEYXRhQ3VlKHRoaXMsIHBhcnRpYWxDdWUuc3RhcnRUaW1lLCB0aW1lLCBwYXJ0aWFsQ3Vl LmN1ZURhdGEpOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfSBlbHNlCi0gICAgICAg IExPRyhNZWRpYSwgIkluYmFuZE1ldGFkYXRhVGV4dFRyYWNrUHJpdmF0ZUFWRjo6YWRkRGF0YUN1 ZSBuZWdhdGl2ZSBsZW5ndGggY3VlKHMpIGlnbm9yZWQ6IHN0YXJ0PSVzLCBlbmQ9JXNcbiIsIHRv U3RyaW5nKG1fY3VycmVudEN1ZVN0YXJ0VGltZSkudXRmOCgpLmRhdGEoKSwgdG9TdHJpbmcodGlt ZSkudXRmOCgpLmRhdGEoKSk7CisgICAgICAgIExPRyhNZWRpYSwgIkluYmFuZE1ldGFkYXRhVGV4 dFRyYWNrUHJpdmF0ZUFWRjo6dXBkYXRlUGVuZGluZ0N1ZUVuZFRpbWVzIG5lZ2F0aXZlIGxlbmd0 aCBjdWUocykgaWdub3JlZDogc3RhcnQ9JXMsIGVuZD0lc1xuIiwgdG9TdHJpbmcobV9jdXJyZW50 Q3VlU3RhcnRUaW1lKS51dGY4KCkuZGF0YSgpLCB0b1N0cmluZyh0aW1lKS51dGY4KCkuZGF0YSgp KTsKIAogICAgIG1faW5jb21wbGV0ZUN1ZXMucmVzaXplKDApOwogICAgIG1fY3VycmVudEN1ZVN0 YXJ0VGltZSA9IE1lZGlhVGltZTo6emVyb1RpbWUoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbk9iakMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2Jq Qy5tbQkocmV2aXNpb24gMTk2MDExKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5t bQkod29ya2luZyBjb3B5KQpAQCAtMjg2MSw2ICsyODYxLDggQEAgdm9pZCBNZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDOgogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRh dGlvbk9iakM6OnByb2Nlc3NDdWUoTlNBcnJheSAqYXR0cmlidXRlZFN0cmluZ3MsIE5TQXJyYXkg Km5hdGl2ZVNhbXBsZXMsIGNvbnN0IE1lZGlhVGltZSYgdGltZSkKIHsKKyAgICBBU1NFUlQodGlt ZSA+PSBNZWRpYVRpbWU6Onplcm9UaW1lKCkpOworCiAgICAgaWYgKCFtX2N1cnJlbnRUZXh0VHJh Y2spCiAgICAgICAgIHJldHVybjsKIApAQCAtMzIzOSwxNCArMzI0MSwxNCBAQCB2b2lkIE1lZGlh UGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6CiAgICAgLy8gU2V0IHRoZSBkdXJhdGlvbiBv ZiBhbGwgaW5jb21wbGV0ZSBjdWVzIGJlZm9yZSBhZGRpbmcgbmV3IG9uZXMuCiAgICAgTWVkaWFU aW1lIGVhcmxpZXN0U3RhcnRUaW1lID0gTWVkaWFUaW1lOjpwb3NpdGl2ZUluZmluaXRlVGltZSgp OwogICAgIGZvciAoQVZNZXRhZGF0YUl0ZW1UeXBlICppdGVtIGluIG1fY3VycmVudE1ldGFEYXRh LmdldCgpKSB7Ci0gICAgICAgIE1lZGlhVGltZSBzdGFydCA9IHRvTWVkaWFUaW1lKGl0ZW0udGlt ZSk7CisgICAgICAgIE1lZGlhVGltZSBzdGFydCA9IHN0ZDo6bWF4KHRvTWVkaWFUaW1lKGl0ZW0u dGltZSksIE1lZGlhVGltZTo6emVyb1RpbWUoKSk7CiAgICAgICAgIGlmIChzdGFydCA8IGVhcmxp ZXN0U3RhcnRUaW1lKQogICAgICAgICAgICAgZWFybGllc3RTdGFydFRpbWUgPSBzdGFydDsKICAg ICB9CiAgICAgbV9tZXRhZGF0YVRyYWNrLT51cGRhdGVQZW5kaW5nQ3VlRW5kVGltZXMoZWFybGll c3RTdGFydFRpbWUpOwogCiAgICAgZm9yIChBVk1ldGFkYXRhSXRlbVR5cGUgKml0ZW0gaW4gbV9j dXJyZW50TWV0YURhdGEuZ2V0KCkpIHsKLSAgICAgICAgTWVkaWFUaW1lIHN0YXJ0ID0gdG9NZWRp YVRpbWUoaXRlbS50aW1lKTsKKyAgICAgICAgTWVkaWFUaW1lIHN0YXJ0ID0gc3RkOjptYXgodG9N ZWRpYVRpbWUoaXRlbS50aW1lKSwgTWVkaWFUaW1lOjp6ZXJvVGltZSgpKTsKICAgICAgICAgTWVk aWFUaW1lIGVuZCA9IE1lZGlhVGltZTo6cG9zaXRpdmVJbmZpbml0ZVRpbWUoKTsKICAgICAgICAg aWYgKENNVElNRV9JU19WQUxJRChpdGVtLmR1cmF0aW9uKSkKICAgICAgICAgICAgIGVuZCA9IHN0 YXJ0ICsgdG9NZWRpYVRpbWUoaXRlbS5kdXJhdGlvbik7CkBAIC0zNTYwLDcgKzM1NjIsOCBAQCAt ICh2b2lkKWxlZ2libGVPdXRwdXQ6KGlkKW91dHB1dCBkaWRPdXRwCiAgICAgICAgIE1lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMqIGNhbGxiYWNrID0gc3Ryb25nU2VsZi0+bV9jYWxs YmFjazsKICAgICAgICAgaWYgKCFjYWxsYmFjaykKICAgICAgICAgICAgIHJldHVybjsKLSAgICAg ICAgY2FsbGJhY2stPnByb2Nlc3NDdWUoc3Ryb25nU3RyaW5ncy5nZXQoKSwgc3Ryb25nU2FtcGxl cy5nZXQoKSwgdG9NZWRpYVRpbWUoaXRlbVRpbWUpKTsKKyAgICAgICAgTWVkaWFUaW1lIHRpbWUg PSBzdGQ6Om1heCh0b01lZGlhVGltZShpdGVtVGltZSksIE1lZGlhVGltZTo6emVyb1RpbWUoKSk7 CisgICAgICAgIGNhbGxiYWNrLT5wcm9jZXNzQ3VlKHN0cm9uZ1N0cmluZ3MuZ2V0KCksIHN0cm9u Z1NhbXBsZXMuZ2V0KCksIHRpbWUpOwogICAgIH0pOwogfQogCkluZGV4OiBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAx OTYwMTEpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwxNyBAQAorMjAxNi0wMi0wNCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNv bT4KKworICAgICAgICBEb24ndCBkaXNjYXJkIGluLWJhbmQgY3VlcyB3aXRoIG5lZ2F0aXZlIHN0 YXJ0IHRpbWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNTM4NjcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE5NTg4NjMyPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC90ZXN0cy9tZWRpYS90 cmFjay1pbi1iYW5kLWhscy1tZXRhZGF0YS1leHBlY3RlZC50eHQ6CisgICAgICAgICogaHR0cC90 ZXN0cy9tZWRpYS90cmFjay1pbi1iYW5kLWhscy1tZXRhZGF0YS5odG1sOiBUZXN0IG1vcmUgYXR0 cmlidXRlcyBmb3IgY29ycmVjdG5lc3MsCisgICAgICAgICAgZmFpbCB0ZXN0IGltbWVkaWF0ZWx5 IGlmIGN1ZS52YWx1ZSBpcyB1bmRlZmluZWQgc28gdGhlIHRlc3QgZG9lc24ndCBnZW5lcmF0ZSBh biBleGNlcHRpb24KKyAgICAgICAgICBhbmQgZXhpdCB3aXRob3V0IGFueSByZXN1bHRzLgorICAg ICAgICAqIHBsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zOiBVbnNraXAgdGVzdC4KKwogMjAx Ni0wMi0wMiAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAg ICBBbGxvdyBwb3J0cyB0byBkaXNhYmxlIGF1dG9tYXRpYyB0ZXh0IHRyYWNrIHNlbGVjdGlvbgpJ bmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS90cmFjay1pbi1iYW5kLWhscy1tZXRh ZGF0YS1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9t ZWRpYS90cmFjay1pbi1iYW5kLWhscy1tZXRhZGF0YS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDE5 NjAxMSkKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvdHJhY2staW4tYmFuZC1obHMt bWV0YWRhdGEtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0yNCwyNiArMjQsMzQgQEAg RVZFTlQoY3VlY2hhbmdlKQogCiAqKiBWYWxpZGF0ZSBjdWUgZGF0YQogKiAxCitFWFBFQ1RFRCAo dHlwZW9mKGN1ZSkgIT0gJ3VuZGVmaW5lZCcpIE9LCiBFWFBFQ1RFRCAoY3VlLnR5cGUgPT0gJ29y Zy5pZDMnKSBPSwogRVhQRUNURUQgKGN1ZS5kYXRhID09ICdudWxsJykgT0sKK0VYUEVDVEVEIChj dWUudmFsdWUgIT0gJ251bGwnKSBPSwogRVhQRUNURUQgKGN1ZS52YWx1ZS5rZXkgPT0gJyJUSVQy IicpIE9LCiBFWFBFQ1RFRCAoY3VlLnZhbHVlLmRhdGEgPT0gJyJTdHJlYW0gQ291bnRpbmciJykg T0sKIAogKiAyCitFWFBFQ1RFRCAodHlwZW9mKGN1ZSkgIT0gJ3VuZGVmaW5lZCcpIE9LCiBFWFBF Q1RFRCAoY3VlLnR5cGUgPT0gJ29yZy5pZDMnKSBPSwogRVhQRUNURUQgKGN1ZS5kYXRhID09ICdu dWxsJykgT0sKK0VYUEVDVEVEIChjdWUudmFsdWUgIT0gJ251bGwnKSBPSwogRVhQRUNURUQgKGN1 ZS52YWx1ZS5rZXkgPT0gJyJUUEUxIicpIE9LCiBFWFBFQ1RFRCAoY3VlLnZhbHVlLmRhdGEgPT0g JyJBbmR5IicpIE9LCiAKICogMworRVhQRUNURUQgKHR5cGVvZihjdWUpICE9ICd1bmRlZmluZWQn KSBPSwogRVhQRUNURUQgKGN1ZS50eXBlID09ICdvcmcuaWQzJykgT0sKIEVYUEVDVEVEIChjdWUu ZGF0YSA9PSAnbnVsbCcpIE9LCitFWFBFQ1RFRCAoY3VlLnZhbHVlICE9ICdudWxsJykgT0sKIEVY UEVDVEVEIChjdWUudmFsdWUua2V5ID09ICciVEFMQiInKSBPSwogRVhQRUNURUQgKGN1ZS52YWx1 ZS5kYXRhID09ICciR3JlYXRlc3QgSGl0cyInKSBPSwogCiAqIDQKK0VYUEVDVEVEICh0eXBlb2Yo Y3VlKSAhPSAndW5kZWZpbmVkJykgT0sKIEVYUEVDVEVEIChjdWUudHlwZSA9PSAnb3JnLmlkMycp IE9LCiBFWFBFQ1RFRCAoY3VlLmRhdGEgPT0gJ251bGwnKSBPSworRVhQRUNURUQgKGN1ZS52YWx1 ZSAhPSAnbnVsbCcpIE9LCiBFWFBFQ1RFRCAoY3VlLnZhbHVlLmtleSA9PSAnIkdFT0IiJykgT0sK IEVYUEVDVEVEIChjdWUudmFsdWUuZGF0YSA9PSAne30nKSBPSwogRVhQRUNURUQgKGN1ZS52YWx1 ZS50eXBlID09ICciaW1hZ2UvcG5nIicpIE9LCkBAIC01MSwxNSArNTksMTkgQEAgRVhQRUNURUQg KGN1ZS52YWx1ZS5pbmZvID09ICciT3VyIEhlcm8iJwogRVhQRUNURUQgKGN1ZS52YWx1ZS5uYW1l ID09ICciYWJlLnBuZyInKSBPSwogCiAqIDUKK0VYUEVDVEVEICh0eXBlb2YoY3VlKSAhPSAndW5k ZWZpbmVkJykgT0sKIEVYUEVDVEVEIChjdWUudHlwZSA9PSAnb3JnLmlkMycpIE9LCiBFWFBFQ1RF RCAoY3VlLmRhdGEgPT0gJ251bGwnKSBPSworRVhQRUNURUQgKGN1ZS52YWx1ZSAhPSAnbnVsbCcp IE9LCiBFWFBFQ1RFRCAoY3VlLnZhbHVlLmtleSA9PSAnIkFQSUMiJykgT0sKIEVYUEVDVEVEIChj dWUudmFsdWUuZGF0YSA9PSAne30nKSBPSwogRVhQRUNURUQgKGN1ZS52YWx1ZS50eXBlID09ICci aW1hZ2UvcG5nIicpIE9LCiAKICogNgorRVhQRUNURUQgKHR5cGVvZihjdWUpICE9ICd1bmRlZmlu ZWQnKSBPSwogRVhQRUNURUQgKGN1ZS50eXBlID09ICdvcmcuaWQzJykgT0sKIEVYUEVDVEVEIChj dWUuZGF0YSA9PSAnbnVsbCcpIE9LCitFWFBFQ1RFRCAoY3VlLnZhbHVlICE9ICdudWxsJykgT0sK IEVYUEVDVEVEIChjdWUudmFsdWUua2V5ID09ICciVFhYWCInKSBPSwogRVhQRUNURUQgKGN1ZS52 YWx1ZS5kYXRhID09ICciVGV4dCBCbG9iIicpIE9LCiAKSW5kZXg6IExheW91dFRlc3RzL2h0dHAv dGVzdHMvbWVkaWEvdHJhY2staW4tYmFuZC1obHMtbWV0YWRhdGEuaHRtbAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL3RyYWNrLWluLWJhbmQtaGxzLW1ldGFkYXRh Lmh0bWwJKHJldmlzaW9uIDE5NjAxMSkKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEv dHJhY2staW4tYmFuZC1obHMtbWV0YWRhdGEuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMTksNiAr MTksNyBAQAogICAgICAgICAgICAgICAgICB7ImtleSIgOiAiVFhYWCIsICJkYXRhIiA6ICJUZXh0 IEJsb2IifSwKICAgICAgICAgICAgIF07CiAgICAgICAgICAgICB2YXIgaW1hZ2VTaXplcyA9IFsg Wzc2LCAxMDNdLCBbMTAwLCAxMDBdIF07CisgICAgICAgICAgICB2YXIgY3VlOwogICAgICAgICAK ICAgICAgICAgICAgIGZ1bmN0aW9uIGFkZHRyYWNrKGV2ZW50KQogICAgICAgICAgICAgewpAQCAt NTYsNyArNTcsNyBAQAogCiAgICAgICAgICAgICBmdW5jdGlvbiBjb21wYXJlQ3VlcyhvYnNlcnZl ZCwgZXhwZWN0ZWQpCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgLy8gTWFrZSBhIG11 dGFibGUgY29weSBvZiB0aGUgY3VlIHNvIHdlIGNhbiByZW1vdmUgYXR0cmlidXRlcyBhcyB0aGV5 IGFyZSBwcm9jZXNzZWQuCisgICAgICAgICAgICAgICAgLy8gTWFrZSBhIG11dGFibGUgY29weSBv ZiBvYnNlcnZlZCBzbyB3ZSBjYW4gcmVtb3ZlIGF0dHJpYnV0ZXMgYXMgdGhleSBhcmUgcHJvY2Vz c2VkLgogICAgICAgICAgICAgICAgIG9ic2VydmVkID0gSlNPTi5wYXJzZShKU09OLnN0cmluZ2lm eShvYnNlcnZlZCkpOwogICAgICAgICAgICAgICAgIGZvciAocHJvcGVydHkgaW4gZXhwZWN0ZWQp IHsKICAgICAgICAgICAgICAgICAgICAgb2JzZXJ2ZWRWYWx1ZSA9IG9ic2VydmVkW3Byb3BlcnR5 XTsKQEAgLTY1LDE0ICs2NiwxNCBAQAogCiAgICAgICAgICAgICAgICAgICAgIG9ic2VydmVkVmFs dWUgPSBKU09OLnN0cmluZ2lmeShvYnNlcnZlZFZhbHVlKTsKICAgICAgICAgICAgICAgICAgICAg ZXhwZWN0ZWRWYWx1ZSA9IEpTT04uc3RyaW5naWZ5KGV4cGVjdGVkVmFsdWUpOwotICAgICAgICAg ICAgICAgICAgICByZXBvcnRFeHBlY3RlZChvYnNlcnZlZFZhbHVlID09IGV4cGVjdGVkVmFsdWUs ICJjdWUudmFsdWUuIiArIHByb3BlcnR5LCAiPT0iLCBleHBlY3RlZFZhbHVlLCBvYnNlcnZlZFZh bHVlKTsKKyAgICAgICAgICAgICAgICAgICAgcmVwb3J0RXhwZWN0ZWQob2JzZXJ2ZWRWYWx1ZSA9 PSBleHBlY3RlZFZhbHVlLCBgY3VlLnZhbHVlLiR7cHJvcGVydHl9YCwgIj09IiwgZXhwZWN0ZWRW YWx1ZSwgb2JzZXJ2ZWRWYWx1ZSk7CiAgICAgICAgICAgICAgICAgICAgIGRlbGV0ZSBvYnNlcnZl ZFtwcm9wZXJ0eV07CiAgICAgICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAgICAgZm9yIChw cm9wZXJ0eSBpbiBvYnNlcnZlZCkgewogICAgICAgICAgICAgICAgICAgICBvYnNlcnZlZE5hbWUg PSBwcm9wZXJ0eTsKICAgICAgICAgICAgICAgICAgICAgb2JzZXJ2ZWRWYWx1ZSA9IG9ic2VydmVk W3Byb3BlcnR5XTsKLSAgICAgICAgICAgICAgICAgICAgbG9nUmVzdWx0KEZhaWxlZCwgIkVycm9y OiB1bmV4cGVjdGVkIGN1ZSBwcm9wZXJ0eSA8ZW0+Y3VlLnZhbHVlLiIgKyBvYnNlcnZlZE5hbWUg KyAiPC9lbT4gPSA8ZW0+JyIgKyBvYnNlcnZlZFZhbHVlICsgIic8L2VtPiAiKTsKKyAgICAgICAg ICAgICAgICAgICAgbG9nUmVzdWx0KEZhaWxlZCwgYEVycm9yOiB1bmV4cGVjdGVkIGN1ZSBwcm9w ZXJ0eSA8ZW0+Y3VlLnZhbHVlLiAke29ic2VydmVkTmFtZX08L2VtPiA9IDxlbT4nICR7b2JzZXJ2 ZWRWYWx1ZX0nPC9lbT5gKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAKQEAg LTg3LDEwICs4OCwxOCBAQAogICAgICAgICAgICAgICAgIHZpZGVvLnBhdXNlKCk7CiAKICAgICAg ICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IDY7IGkrKykgewotICAgICAgICAgICAgICAg ICAgICBjb25zb2xlV3JpdGUoIjxlbT4qICIgKyAoaSArIDEpICsgIjwvZW0+Iik7CisgICAgICAg ICAgICAgICAgICAgIGNvbnNvbGVXcml0ZShgPGVtPiogJHtpICsgMX08L2VtPmApOwogICAgICAg ICAgICAgICAgICAgICBjdWUgPSB0cmFjay5jdWVzW2ldOworCisgICAgICAgICAgICAgICAgICAg IHRlc3RFeHBlY3RlZCgidHlwZW9mKGN1ZSkiLCB1bmRlZmluZWQsICIhPSIpOwogICAgICAgICAg ICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoImN1ZS50eXBlIiwgIm9yZy5pZDMiKTsKICAgICAgICAg ICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJjdWUuZGF0YSIsIG51bGwpOworICAgICAgICAgICAg ICAgICAgICB0ZXN0RXhwZWN0ZWQoImN1ZS52YWx1ZSIsIG51bGwsICIhPSIpOworICAgICAgICAg ICAgICAgICAgICBpZiAodHlwZW9mKGN1ZS52YWx1ZSkgPT0gdW5kZWZpbmVkKSB7CisgICAgICAg ICAgICAgICAgICAgICAgICBmYWlsVGVzdChgRXJyb3I6IGN1ZS52YWx1ZSBpcyB1bmRlZmluZWQh YCk7CisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgICAg IH0KKwogICAgICAgICAgICAgICAgICAgICBjb21wYXJlQ3VlcyhjdWUudmFsdWUsIGN1ZURhdGFb aV0pOwogICAgICAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOwogICAgICAgICAgICAg ICAgIH0KQEAgLTExNCw3ICsxMjMsNyBAQAogICAgICAgICAgICAgICAgIHJ1bigidmlkZW8uc3Jj ID0gJ2h0dHA6Ly8xMjcuMC4wLjE6ODAwMC9tZWRpYS9yZXNvdXJjZXMvaGxzL21ldGFkYXRhL3By b2dfaW5kZXgubTN1OCciKTsKIAogICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7Ci0g ICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50KCJjYW5wbGF5dGhyb3VnaCIsIGNhbnBsYXl0aHJv dWdoKTsKKyAgICAgICAgICAgICAgICB3YWl0Rm9yRXZlbnRPbmNlKCJjYW5wbGF5dGhyb3VnaCIs IGNhbnBsYXl0aHJvdWdoKTsKICAgICAgICAgICAgICAgICB3YWl0Rm9yRXZlbnQoJ2FkZHRyYWNr JywgYWRkdHJhY2ssIGZhbHNlLCBmYWxzZSwgdmlkZW8udGV4dFRyYWNrcyk7CiAgICAgICAgICAg ICB9CiAgICAgICAgIDwvc2NyaXB0PgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rl c3RFeHBlY3RhdGlvbnMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rl c3RFeHBlY3RhdGlvbnMJKHJldmlzaW9uIDE5NjAxMSkKKysrIExheW91dFRlc3RzL3BsYXRmb3Jt L21hYy9UZXN0RXhwZWN0YXRpb25zCSh3b3JraW5nIGNvcHkpCkBAIC05MDYsNyArOTA2LDYgQEAg d2Via2l0Lm9yZy9iLzEyMjUwNyBtZWRpYS90cmFjay90cmFjay1jdQogd2Via2l0Lm9yZy9iLzEy MzAxMCBtZWRpYS9XM0MvYXVkaW8vbmV0d29ya1N0YXRlL25ldHdvcmtTdGF0ZV9kdXJpbmdfbG9h ZHN0YXJ0Lmh0bWwgWyBQYXNzIFRpbWVvdXQgXQogd2Via2l0Lm9yZy9iLzEyMzA5OSBtZWRpYS9t ZWRpYS1jb250cm9sbGVyLXRpbWUtY2xhbXAuaHRtbCBbIFBhc3MgVGltZW91dCBdCiB3ZWJraXQu b3JnL2IvMTIzNTIyIG1lZGlhL3RyYWNrL3RyYWNrLWluLWJhbmQtbGVnYWN5LWFwaS5odG1sIFsg UGFzcyBGYWlsdXJlIENyYXNoIF0KLXdlYmtpdC5vcmcvYi8xMjgzMTIgbWVkaWEvdmlkZW8tbG9h ZC1wcmVsb2FkLW1ldGFkYXRhLmh0bWwgWyBQYXNzIEZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzEz MDQ5MCBtZWRpYS92aWRlby1yZW1vdGUtY29udHJvbC1wbGF5cGF1c2UuaHRtbCBbIFBhc3MgRmFp bHVyZSBdCiB3ZWJraXQub3JnL2IvMTMwOTcxIG1lZGlhL3RyYWNrL3RyYWNrLXJlbW92ZS10cmFj ay5odG1sIFsgUGFzcyBDcmFzaCBGYWlsdXJlIFRpbWVvdXQgXQogd2Via2l0Lm9yZy9iLzEzMTg1 NSBtZWRpYS9ldmVudC1hdHRyaWJ1dGVzLmh0bWwgWyBQYXNzIEZhaWx1cmUgVGltZW91dCBdCg==