84996 2012-04-26 13:04:07 -0700 Fix missing sourceState change on MEDIA_ERR_SOURCE_NOT_SUPPORTED error. 2012-04-26 15:33:36 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 83607 1 acolwell acolwell eric.carlson feature-media-reviews webkit.review.bot oldest_to_newest 610870 0 acolwell 2012-04-26 13:04:07 -0700 In cases where appending data with webkitSourceAppend() triggers a MEDIA_ERR_SOURCE_NOT_SUPPORTED error, the m_sourceState was not being reset to SOURCE_CLOSED. This was causing future calls to webkitSourceAppend() after the error to actually make calls to m_player->sourceAppend() instead of throwing an INVALID_STATE_ERR exception like they were supposed to. This was causing crashes in Chromium because the code assumes that once it reports the error to WebKit it won't get any more calls to m_player->sourceAppend(). 610873 1 139052 acolwell 2012-04-26 13:09:09 -0700 Created attachment 139052 Patch 611036 2 139052 webkit.review.bot 2012-04-26 15:33:31 -0700 Comment on attachment 139052 Patch Clearing flags on attachment: 139052 Committed r115380: <http://trac.webkit.org/changeset/115380> 611037 3 webkit.review.bot 2012-04-26 15:33:36 -0700 All reviewed patches have been landed. Closing bug. 139052 2012-04-26 13:09:09 -0700 2012-04-26 15:33:31 -0700 Patch bug-84996-20120426130907.patch text/plain 11921 acolwell U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1MzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGViMTg3Y2Q2ZDFjMWY3 NGE2Yjc3OWExZDJkMGQ4ZDhhOGMzOWI4ZS4uMjg0OGEzOWQ3ODA4YzBiYzc0MzBmMWI4ZDczYjQz YTkwNmY2OWVmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA0LTI2ICBBYXJv biBDb2x3ZWxsICA8YWNvbHdlbGxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEZpeCBtaXNzaW5n IHNvdXJjZVN0YXRlIGNoYW5nZSBvbiBNRURJQV9FUlJfU09VUkNFX05PVF9TVVBQT1JURUQgZXJy b3IuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDk5 NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cy4gaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2Uvd2VibS92aWRlby1tZWRpYS1z b3VyY2UtZXJyb3JzLmh0bWwgd2FzIHVwZGF0ZWQgdG8gdmVyaWZ5IHRoYXQgd2Via2l0U291cmNl U3RhdGUgaXMgYWx3YXlzIFNPVVJDRV9DTE9TRUQgd2hlbiB0aGUgb25lcnJvciBldmVudCBmaXJl cy4KKworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpIVE1MTWVkaWFFbGVtZW50Ojpub25lU3VwcG9ydGVkKToKKwogMjAxMi0wNC0yNiAgQ2hy aXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwuY29tPgogCiAgICAgICAgIFtF RkxdIEVuYWJsZSBWSURFT19UUkFDSyBmZWF0dXJlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVk aWFFbGVtZW50LmNwcAppbmRleCAyYTI3NmFlYzA2OTcxNzkzODA2NWY4NjY1ZTI3NjBkNGNmYjc0 MGViLi5lYjZkZWI4ODI4N2ZlYWJkODBlZjI1YjE3ZTYxZTA3NjNjMmEyNzUxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAgLTEzOTUsNiArMTM5NSwxMSBAQCB2 b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om5vbmVTdXBwb3J0ZWQoKQogICAgIC8vIDcgLSBRdWV1ZSBh IHRhc2sgdG8gZmlyZSBhIHNpbXBsZSBldmVudCBuYW1lZCBlcnJvciBhdCB0aGUgbWVkaWEgZWxl bWVudC4KICAgICBzY2hlZHVsZUV2ZW50KGV2ZW50TmFtZXMoKS5lcnJvckV2ZW50KTsKIAorI2lm IEVOQUJMRShNRURJQV9TT1VSQ0UpCisgICAgaWYgKG1fc291cmNlU3RhdGUgIT0gU09VUkNFX0NM T1NFRCkKKyAgICAgICAgc2V0U291cmNlU3RhdGUoU09VUkNFX0NMT1NFRCk7CisjZW5kaWYKKwog ICAgIC8vIDggLSBTZXQgdGhlIGVsZW1lbnQncyBkZWxheWluZy10aGUtbG9hZC1ldmVudCBmbGFn IHRvIGZhbHNlLiBUaGlzIHN0b3BzIGRlbGF5aW5nIHRoZSBsb2FkIGV2ZW50LgogICAgIHNldFNo b3VsZERlbGF5TG9hZEV2ZW50KGZhbHNlKTsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGI0ZGQ4MjhjNjA0Y2IyNzYwMmY2 YTFiNzY1NTZmMTc3NzgxNTYwMTAuLjY4ZGY4YTZjNGVkNDY0MGE0NDY2NmI2NmQ1ZWE4N2QzOTRm MDhiMmIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0wNC0yNiAgQWFyb24gQ29sd2VsbCAg PGFjb2x3ZWxsQGNocm9taXVtLm9yZz4KKworICAgICAgICBVcGRhdGluZyBNZWRpYVNvdXJjZSBs YXlvdXQgdGVzdCB0byB2ZXJpZnkgdGhhdCB3ZWJraXRTb3VyY2VTdGF0ZSBpcyBhbHdheXMKKyAg ICAgICAgU09VUkNFX0NMT1NFRCB3aGVuIGFuIGVycm9yIG9jY3Vycy4KKyAgICAgICAgCisgICAg ICAgIE1pbm9yIHN0eWxlIGZpeGVzIGFuZCBpbmZvcm1hdGl2ZSBjb25zb2xlIG1lc3NhZ2VzIHdl cmUgYWxzbyBhZGRlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTg0OTk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBodHRwL3Rlc3RzL21lZGlhL21lZGlhLXNvdXJjZS93ZWJtL3ZpZGVvLW1lZGlhLXNv dXJjZS1lcnJvcnMtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGh0dHAvdGVzdHMvbWVkaWEvbWVk aWEtc291cmNlL3dlYm0vdmlkZW8tbWVkaWEtc291cmNlLWVycm9ycy5odG1sOgorCiAyMDEyLTA0 LTI2ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CiAKICAg ICAgICAgW0VGTF0gRW5hYmxlIFZJREVPX1RSQUNLIGZlYXR1cmUKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL3dlYm0vdmlkZW8tbWVkaWEtc291 cmNlLWVycm9ycy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL21l ZGlhLXNvdXJjZS93ZWJtL3ZpZGVvLW1lZGlhLXNvdXJjZS1lcnJvcnMtZXhwZWN0ZWQudHh0Cmlu ZGV4IDE3YjMxMWYyYmM0MjJkMzBhOWIxZDM4NDU0ODc4Yzc4MGFiY2YxOWEuLjI2ZDZiN2YyNDA1 Nzc5YmNlN2Q4NWE2NDkzOWU5ZjY0MzZiYjA1MTUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL3dlYm0vdmlkZW8tbWVkaWEtc291cmNlLWVycm9y cy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1z b3VyY2Uvd2VibS92aWRlby1tZWRpYS1zb3VyY2UtZXJyb3JzLWV4cGVjdGVkLnR4dApAQCAtNCwy NiArNCwzMyBAQCBFVkVOVChsb2Fkc3RhcnQpCiBFVkVOVCh3ZWJraXRzb3VyY2VvcGVuKQogCiBy dW5uaW5nIGRpZE5vdFNlbmRIZWFkZXJzRmlyc3QKK1Rlc3QgYXBwZW5kaW5nIGNsdXN0ZXIgZGF0 YSBiZWZvcmUgc2VuZGluZyB0aGUgaGVhZGVycy4KIEVWRU5UKGVycm9yKSA6IE1FRElBX0VSUl9T UkNfTk9UX1NVUFBPUlRFRAogRVZFTlQoZW1wdGllZCkKIEVWRU5UKGxvYWRzdGFydCkKIEVWRU5U KHdlYmtpdHNvdXJjZW9wZW4pCiAKIHJ1bm5pbmcgYXBwZW5kU2FtZUNsdXN0ZXJUd2ljZQorVGVz dCBhcHBlbmRpbmcgdGhlIHNhbWUgY2x1c3RlciB0d2ljZS4KIEVWRU5UKGxvYWRlZG1ldGFkYXRh KQorQXBwZW5kaW5nIHRoZSBsYXN0IGFwcGVuZGVkIGNsdXN0ZXIgYWdhaW4uCiBFVkVOVChlcnJv cikgOiBNRURJQV9FUlJfREVDT0RFCiBFVkVOVChlbXB0aWVkKQogRVZFTlQobG9hZHN0YXJ0KQog RVZFTlQod2Via2l0c291cmNlb3BlbikKIAogcnVubmluZyBhcHBlbmRDbHVzdGVyc091dE9mT3Jk ZXIKK1Rlc3QgY2x1c3RlcnMgYXBwZW5kZWQgb3V0IG9mIG9yZGVyLgogRVZFTlQobG9hZGVkbWV0 YWRhdGEpCitBcHBlbmQgMSBwYXN0IHRoZSBuZXh0IGNsdXN0ZXIuCitBcHBlbmQgdGhlIG5leHQg Y2x1c3Rlci4KIEVWRU5UKGVycm9yKSA6IE1FRElBX0VSUl9ERUNPREUKIEVWRU5UKGVtcHRpZWQp CiBFVkVOVChsb2Fkc3RhcnQpCiBFVkVOVCh3ZWJraXRzb3VyY2VvcGVuKQogCiBydW5uaW5nIGlt bWVkaWF0ZURlY29kZUVycm9yVmlhRW5kT2ZTdHJlYW0KK1Rlc3Qgc2lnbmFsbGluZyBhIGRlY29k ZSBlcnJvciB3aXRoIHdlYmtpdFNvdXJjZUVuZE9mU3RyZWFtLgogRVZFTlQod2Via2l0c291cmNl ZW5kZWQpCiBFVkVOVChlcnJvcikgOiBNRURJQV9FUlJfU1JDX05PVF9TVVBQT1JURUQKIEVWRU5U KGVtcHRpZWQpCkBAIC0zMSw2ICszOCw3IEBAIEVWRU5UKGxvYWRzdGFydCkKIEVWRU5UKHdlYmtp dHNvdXJjZW9wZW4pCiAKIHJ1bm5pbmcgaW1tZWRpYXRlTmV0d29ya0Vycm9yVmlhRW5kT2ZTdHJl YW0KK1Rlc3Qgc2lnbmFsbGluZyBhIG5ldHdvcmsgZXJyb3Igd2l0aCB3ZWJraXRTb3VyY2VFbmRP ZlN0cmVhbS4KIEVWRU5UKHdlYmtpdHNvdXJjZWVuZGVkKQogRVZFTlQoZXJyb3IpIDogTUVESUFf RVJSX1NSQ19OT1RfU1VQUE9SVEVECiBFVkVOVChlbXB0aWVkKQpAQCAtMzgsNiArNDYsNyBAQCBF VkVOVChsb2Fkc3RhcnQpCiBFVkVOVCh3ZWJraXRzb3VyY2VvcGVuKQogCiBydW5uaW5nIGRlY29k ZUVycm9yQWZ0ZXJIYXZlTWV0YWRhdGEKK1Rlc3Qgc2lnbmFsbGluZyBhIGRlY29kZSBlcnJvciB3 aXRoIHdlYmtpdFNvdXJjZUVuZE9mU3RyZWFtIGFmdGVyIHdlIGhhdmUgYXBwZW5kZWQgZW5vdWdo IGRhdGEgdG8gZ2V0IHRvIHRoZSBIQVZFX01FVEFEQVRBIHN0YXRlLgogRVZFTlQobG9hZGVkbWV0 YWRhdGEpCiBFVkVOVCh3ZWJraXRzb3VyY2VlbmRlZCkKIEVWRU5UKGVycm9yKSA6IE1FRElBX0VS Ul9ERUNPREUKQEAgLTQ2LDYgKzU1LDcgQEAgRVZFTlQobG9hZHN0YXJ0KQogRVZFTlQod2Via2l0 c291cmNlb3BlbikKIAogcnVubmluZyBuZXR3b3JrRXJyb3JBZnRlckhhdmVNZXRhZGF0YQorVGVz dCBzaWduYWxsaW5nIGEgbmV0d29yayBlcnJvciB3aXRoIHdlYmtpdFNvdXJjZUVuZE9mU3RyZWFt IGFmdGVyIHdlIGhhdmUgYXBwZW5kZWQgZW5vdWdoIGRhdGEgdG8gZ2V0IHRvIHRoZSBIQVZFX01F VEFEQVRBIHN0YXRlLgogRVZFTlQobG9hZGVkbWV0YWRhdGEpCiBFVkVOVCh3ZWJraXRzb3VyY2Vl bmRlZCkKIEVWRU5UKGVycm9yKSA6IE1FRElBX0VSUl9ORVRXT1JLCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL21lZGlhLXNvdXJjZS93ZWJtL3ZpZGVvLW1lZGlhLXNv dXJjZS1lcnJvcnMuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc291 cmNlL3dlYm0vdmlkZW8tbWVkaWEtc291cmNlLWVycm9ycy5odG1sCmluZGV4IDBkZTdjNjAwNzc2 MDIzMmQ2MGQyZjExYTIzMDUzZWZkMDdhYzU2MWEuLmM2MjA2MTQ2OWY5YWY0ZmRjOTk0ODZhZDU3 MjJlYzdjMTY4NjRhODYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEv bWVkaWEtc291cmNlL3dlYm0vdmlkZW8tbWVkaWEtc291cmNlLWVycm9ycy5odG1sCisrKyBiL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL3dlYm0vdmlkZW8tbWVkaWEt c291cmNlLWVycm9ycy5odG1sCkBAIC0yNCw2ICsyNCwxMiBAQAogICAgICAgICAgICAgICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIGNvbnNvbGVX cml0ZSgiRVZFTlQoZXJyb3IpIDogIiArIGVycm9yU3RyaW5nKTsKKworICAgICAgICAgICAgICAg IGlmICh2aWRlb1RhZy53ZWJraXRTb3VyY2VTdGF0ZSAhPSBIVE1MTWVkaWFFbGVtZW50LlNPVVJD RV9DTE9TRUQpIHsKKyAgICAgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCJVbmV4cGVjdGVk IHNvdXJjZSBzdGF0ZS4gRXhwZWN0ZWQgU09VUkNFX0NMT1NFRCIgKworICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIiBnb3QgIiArIGdldFNvdXJjZVN0YXRlTmFtZSh2aWRlb1RhZy53 ZWJraXRTb3VyY2VTdGF0ZSkpOworICAgICAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgICAg IHJ1bk5leHRUZXN0Q2FzZSh2aWRlb1RhZyk7CiAgICAgICAgICAgICB9CiAKQEAgLTM2LDkwICs0 Miw5NCBAQAogICAgICAgICAgICAgICAgIGFwcGVuZENsdXN0ZXIodmlkZW9UYWcsIG5leHRDbHVz dGVySW5kZXgrKyk7CiAgICAgICAgICAgICAgICAgYXBwZW5kQ2x1c3Rlcih2aWRlb1RhZywgbmV4 dENsdXN0ZXJJbmRleCsrKTsKIAotICAgICAgICAgICAgICAgIHZhciBldmVudEhhbmRsZXIgPSBm dW5jdGlvbihldmVudCkgeworICAgICAgICAgICAgICAgIHZhciBldmVudEhhbmRsZXIgPSBmdW5j dGlvbihldmVudCkKKyAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgICAgIHZpZGVv VGFnLnJlbW92ZUV2ZW50TGlzdGVuZXIoJ2xvYWRlZG1ldGFkYXRhJywgZXZlbnRIYW5kbGVyKTsK ICAgICAgICAgICAgICAgICAgICAgZG9uZUNhbGxiYWNrKCk7CiAgICAgICAgICAgICAgICAgfTsK ICAgICAgICAgICAgICAgICB2aWRlb1RhZy5hZGRFdmVudExpc3RlbmVyKCdsb2FkZWRtZXRhZGF0 YScsIGV2ZW50SGFuZGxlcik7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIC8vIFRlc3Qg YXBwZW5kaW5nIGNsdXN0ZXIgZGF0YSBiZWZvcmUgc2VuZGluZyB0aGUgaGVhZGVycy4KICAgICAg ICAgICAgIGZ1bmN0aW9uIGRpZE5vdFNlbmRIZWFkZXJzRmlyc3QoZXZlbnQpCiAgICAgICAgICAg ICB7CisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCJUZXN0IGFwcGVuZGluZyBjbHVzdGVy IGRhdGEgYmVmb3JlIHNlbmRpbmcgdGhlIGhlYWRlcnMuIik7CiAgICAgICAgICAgICAgICAgYXBw ZW5kQ2x1c3RlcihldmVudC50YXJnZXQsIDApOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAg ICAvLyBUZXN0IGFwcGVuZGluZyB0aGUgc2FtZSBjbHVzdGVyIHR3aWNlLgogICAgICAgICAgICAg ZnVuY3Rpb24gYXBwZW5kU2FtZUNsdXN0ZXJUd2ljZShldmVudCkKICAgICAgICAgICAgIHsKKyAg ICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIlRlc3QgYXBwZW5kaW5nIHRoZSBzYW1lIGNsdXN0 ZXIgdHdpY2UuIik7CiAgICAgICAgICAgICAgICAgdmFyIHZpZGVvVGFnID0gZXZlbnQudGFyZ2V0 OwogCiAgICAgICAgICAgICAgICAgYXBwZW5kSGVhZGVycyh2aWRlb1RhZyk7Ci0gICAgICAgICAg ICAgICAgYXBwZW5kRW5vdWdoQ2x1c3RlcnNUb1RyaWdnZXJNZXRhZGF0YUxvYWRlZCh2aWRlb1Rh ZywgZnVuY3Rpb24oKSB7CisgICAgICAgICAgICAgICAgYXBwZW5kRW5vdWdoQ2x1c3RlcnNUb1Ry aWdnZXJNZXRhZGF0YUxvYWRlZCh2aWRlb1RhZywgZnVuY3Rpb24oKQorICAgICAgICAgICAgICAg IHsKKyAgICAgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCJBcHBlbmRpbmcgdGhlIGxhc3Qg YXBwZW5kZWQgY2x1c3RlciBhZ2Fpbi4iKTsKICAgICAgICAgICAgICAgICAgICAgYXBwZW5kQ2x1 c3Rlcih2aWRlb1RhZywgbmV4dENsdXN0ZXJJbmRleCAtIDEpOwogICAgICAgICAgICAgICAgIH0p OwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAvLyBUZXN0IGNsdXN0ZXJzIGFwcGVuZGVk IG91dCBvZiBvcmRlci4KICAgICAgICAgICAgIGZ1bmN0aW9uIGFwcGVuZENsdXN0ZXJzT3V0T2ZP cmRlcihldmVudCkKICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUo IlRlc3QgY2x1c3RlcnMgYXBwZW5kZWQgb3V0IG9mIG9yZGVyLiIpOwogICAgICAgICAgICAgICAg IHZhciB2aWRlb1RhZyA9IGV2ZW50LnRhcmdldDsKIAogICAgICAgICAgICAgICAgIGFwcGVuZEhl YWRlcnModmlkZW9UYWcpOwotICAgICAgICAgICAgICAgIGFwcGVuZEVub3VnaENsdXN0ZXJzVG9U cmlnZ2VyTWV0YWRhdGFMb2FkZWQodmlkZW9UYWcsIGZ1bmN0aW9uKCkgewotICAgICAgICAgICAg ICAgICAgICAvLyBBcHBlbmQgMSBwYXN0IHRoZSBuZXh0IGNsdXN0ZXIuCisgICAgICAgICAgICAg ICAgYXBwZW5kRW5vdWdoQ2x1c3RlcnNUb1RyaWdnZXJNZXRhZGF0YUxvYWRlZCh2aWRlb1RhZywg ZnVuY3Rpb24oKQorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgY29uc29s ZVdyaXRlKCJBcHBlbmQgMSBwYXN0IHRoZSBuZXh0IGNsdXN0ZXIuIik7CiAgICAgICAgICAgICAg ICAgICAgIGFwcGVuZENsdXN0ZXIodmlkZW9UYWcsIG5leHRDbHVzdGVySW5kZXggKyAxKTsKIAot ICAgICAgICAgICAgICAgICAgICAvLyBBcHBlbmQgdGhlIG5leHQgY2x1c3Rlci4KKyAgICAgICAg ICAgICAgICAgICAgY29uc29sZVdyaXRlKCJBcHBlbmQgdGhlIG5leHQgY2x1c3Rlci4iKTsKICAg ICAgICAgICAgICAgICAgICAgYXBwZW5kQ2x1c3Rlcih2aWRlb1RhZywgbmV4dENsdXN0ZXJJbmRl eCk7CiAgICAgICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIC8v IFRlc3Qgc2lnbmFsbGluZyBhIGRlY29kZSBlcnJvciB3aXRoIHdlYmtpdFNvdXJjZUVuZE9mU3Ry ZWFtLgogICAgICAgICAgICAgZnVuY3Rpb24gaW1tZWRpYXRlRGVjb2RlRXJyb3JWaWFFbmRPZlN0 cmVhbShldmVudCkKICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgY29uc29sZVdyaXRl KCJUZXN0IHNpZ25hbGxpbmcgYSBkZWNvZGUgZXJyb3Igd2l0aCB3ZWJraXRTb3VyY2VFbmRPZlN0 cmVhbS4iKTsKICAgICAgICAgICAgICAgICAgdmFyIHZpZGVvVGFnID0gZXZlbnQudGFyZ2V0Owog ICAgICAgICAgICAgICAgICB2aWRlb1RhZy53ZWJraXRTb3VyY2VFbmRPZlN0cmVhbShIVE1MTWVk aWFFbGVtZW50LkVPU19ERUNPREVfRVJSKTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAg Ly8gVGVzdCBzaWduYWxsaW5nIGEgbmV0d29yayBlcnJvciB3aXRoIHdlYmtpdFNvdXJjZUVuZE9m U3RyZWFtLgogICAgICAgICAgICAgZnVuY3Rpb24gaW1tZWRpYXRlTmV0d29ya0Vycm9yVmlhRW5k T2ZTdHJlYW0oZXZlbnQpCiAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgY29uc29sZVdy aXRlKCJUZXN0IHNpZ25hbGxpbmcgYSBuZXR3b3JrIGVycm9yIHdpdGggd2Via2l0U291cmNlRW5k T2ZTdHJlYW0uIik7CiAgICAgICAgICAgICAgICAgdmFyIHZpZGVvVGFnID0gZXZlbnQudGFyZ2V0 OwogICAgICAgICAgICAgICAgIHZpZGVvVGFnLndlYmtpdFNvdXJjZUVuZE9mU3RyZWFtKEhUTUxN ZWRpYUVsZW1lbnQuRU9TX05FVFdPUktfRVJSKTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAg ICAgLy8gVGVzdCBzaWduYWxsaW5nIGEgZGVjb2RlIGVycm9yIHdpdGggd2Via2l0U291cmNlRW5k T2ZTdHJlYW0gYWZ0ZXIgd2UKLSAgICAgICAgICAgIC8vIGhhdmUgYXBwZW5kZWQgZW5vdWdoIGRh dGEgdG8gZ2V0IHRvIHRoZSBIQVZFX01FVEFEQVRBIHN0YXRlLgogICAgICAgICAgICAgZnVuY3Rp b24gZGVjb2RlRXJyb3JBZnRlckhhdmVNZXRhZGF0YShldmVudCkKICAgICAgICAgICAgIHsKKyAg ICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIlRlc3Qgc2lnbmFsbGluZyBhIGRlY29kZSBlcnJv ciB3aXRoIHdlYmtpdFNvdXJjZUVuZE9mU3RyZWFtIGFmdGVyIHdlIGhhdmUgYXBwZW5kZWQgZW5v dWdoIGRhdGEgdG8gZ2V0IHRvIHRoZSBIQVZFX01FVEFEQVRBIHN0YXRlLiIpOwogICAgICAgICAg ICAgICAgIHZhciB2aWRlb1RhZyA9IGV2ZW50LnRhcmdldDsKICAgICAgICAgICAgICAgICBhcHBl bmRIZWFkZXJzKHZpZGVvVGFnKTsKIAotICAgICAgICAgICAgICAgIGFwcGVuZEVub3VnaENsdXN0 ZXJzVG9UcmlnZ2VyTWV0YWRhdGFMb2FkZWQodmlkZW9UYWcsIGZ1bmN0aW9uKCkgeworICAgICAg ICAgICAgICAgIGFwcGVuZEVub3VnaENsdXN0ZXJzVG9UcmlnZ2VyTWV0YWRhdGFMb2FkZWQodmlk ZW9UYWcsIGZ1bmN0aW9uKCkKKyAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgICAg IHZpZGVvVGFnLndlYmtpdFNvdXJjZUVuZE9mU3RyZWFtKEhUTUxNZWRpYUVsZW1lbnQuRU9TX0RF Q09ERV9FUlIpOwogICAgICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgfQogCi0gICAgICAg ICAgICAvLyBUZXN0IHNpZ25hbGxpbmcgYSBuZXR3b3JrIGVycm9yIHdpdGggd2Via2l0U291cmNl RW5kT2ZTdHJlYW0gYWZ0ZXIgd2UKLSAgICAgICAgICAgIC8vIGhhdmUgYXBwZW5kZWQgZW5vdWdo IGRhdGEgdG8gZ2V0IHRvIHRoZSBIQVZFX01FVEFEQVRBIHN0YXRlLgogICAgICAgICAgICAgZnVu Y3Rpb24gbmV0d29ya0Vycm9yQWZ0ZXJIYXZlTWV0YWRhdGEoZXZlbnQpCiAgICAgICAgICAgICB7 CisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCJUZXN0IHNpZ25hbGxpbmcgYSBuZXR3b3Jr IGVycm9yIHdpdGggd2Via2l0U291cmNlRW5kT2ZTdHJlYW0gYWZ0ZXIgd2UgaGF2ZSBhcHBlbmRl ZCBlbm91Z2ggZGF0YSB0byBnZXQgdG8gdGhlIEhBVkVfTUVUQURBVEEgc3RhdGUuIik7CiAgICAg ICAgICAgICAgICAgdmFyIHZpZGVvVGFnID0gZXZlbnQudGFyZ2V0OwogICAgICAgICAgICAgICAg IGFwcGVuZEhlYWRlcnModmlkZW9UYWcpOwotICAgICAgICAgICAgICAgIGFwcGVuZEVub3VnaENs dXN0ZXJzVG9UcmlnZ2VyTWV0YWRhdGFMb2FkZWQodmlkZW9UYWcsIGZ1bmN0aW9uKCkgeworICAg ICAgICAgICAgICAgIGFwcGVuZEVub3VnaENsdXN0ZXJzVG9UcmlnZ2VyTWV0YWRhdGFMb2FkZWQo dmlkZW9UYWcsIGZ1bmN0aW9uKCkKKyAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAg ICAgIHZpZGVvVGFnLndlYmtpdFNvdXJjZUVuZE9mU3RyZWFtKEhUTUxNZWRpYUVsZW1lbnQuRU9T X05FVFdPUktfRVJSKTsKICAgICAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgIH0KIAogICAg ICAgICAgICAgdmFyIHRlc3RDYXNlcyA9IFsKLSAgICAgICAgICAgICAgICAiZGlkTm90U2VuZEhl YWRlcnNGaXJzdCIsCi0gICAgICAgICAgICAgICAgImFwcGVuZFNhbWVDbHVzdGVyVHdpY2UiLAot ICAgICAgICAgICAgICAgICJhcHBlbmRDbHVzdGVyc091dE9mT3JkZXIiLAotICAgICAgICAgICAg ICAgICJpbW1lZGlhdGVEZWNvZGVFcnJvclZpYUVuZE9mU3RyZWFtIiwKLSAgICAgICAgICAgICAg ICAiaW1tZWRpYXRlTmV0d29ya0Vycm9yVmlhRW5kT2ZTdHJlYW0iLAotICAgICAgICAgICAgICAg ICJkZWNvZGVFcnJvckFmdGVySGF2ZU1ldGFkYXRhIiwKLSAgICAgICAgICAgICAgICAibmV0d29y a0Vycm9yQWZ0ZXJIYXZlTWV0YWRhdGEiCisgICAgICAgICAgICAgICAgZGlkTm90U2VuZEhlYWRl cnNGaXJzdCwKKyAgICAgICAgICAgICAgICBhcHBlbmRTYW1lQ2x1c3RlclR3aWNlLAorICAgICAg ICAgICAgICAgIGFwcGVuZENsdXN0ZXJzT3V0T2ZPcmRlciwKKyAgICAgICAgICAgICAgICBpbW1l ZGlhdGVEZWNvZGVFcnJvclZpYUVuZE9mU3RyZWFtLAorICAgICAgICAgICAgICAgIGltbWVkaWF0 ZU5ldHdvcmtFcnJvclZpYUVuZE9mU3RyZWFtLAorICAgICAgICAgICAgICAgIGRlY29kZUVycm9y QWZ0ZXJIYXZlTWV0YWRhdGEsCisgICAgICAgICAgICAgICAgbmV0d29ya0Vycm9yQWZ0ZXJIYXZl TWV0YWRhdGEKICAgICAgICAgICAgIF07CiAKICAgICAgICAgICAgIHZhciB0ZXN0Q2FzZUluZGV4 ID0gMDsKQEAgLTEzMSw4ICsxNDEsOCBAQAogICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAgICAgdmFyIGZ1bmN0aW9uTmFtZSA9IHRl c3RDYXNlc1t0ZXN0Q2FzZUluZGV4XTsKLSAgICAgICAgICAgICAgICB2YXIgb25PcGVuRnVuY3Rp b24gPSBldmFsKGZ1bmN0aW9uTmFtZSk7CisgICAgICAgICAgICAgICAgdmFyIG9uT3BlbkZ1bmN0 aW9uID0gdGVzdENhc2VzW3Rlc3RDYXNlSW5kZXhdOworICAgICAgICAgICAgICAgIHZhciBmdW5j dGlvbk5hbWUgPSBvbk9wZW5GdW5jdGlvbi5uYW1lOwogICAgICAgICAgICAgICAgIHRlc3RDYXNl SW5kZXgrKzsKIAogICAgICAgICAgICAgICAgIHZhciBldmVudEhhbmRsZXJGdW5jdGlvbiA9IGZ1 bmN0aW9uIChldmVudCkgewpAQCAtMTU5LDcgKzE2OSw4IEBACiAKICAgICAgICAgICAgICAgICB2 aWRlby5hZGRFdmVudExpc3RlbmVyKCdlcnJvcicsIG9uRXJyb3IpOwogCi0gICAgICAgICAgICAg ICAgbG9hZFdlYk1EYXRhKGZ1bmN0aW9uKHN1Y2Nlc3MpIHsKKyAgICAgICAgICAgICAgICBsb2Fk V2ViTURhdGEoZnVuY3Rpb24oc3VjY2VzcykKKyAgICAgICAgICAgICAgICB7CiAgICAgICAgICAg ICAgICAgICAgIGlmICghc3VjY2VzcykgewogICAgICAgICAgICAgICAgICAgICAgICAgZmFpbFRl c3QoIkZhaWxlZCB0byBsb2FkIFdlYk0gZGF0YSIpOwogICAgICAgICAgICAgICAgICAgICAgICAg cmV0dXJuOwo=