151048 2015-11-09 12:55:04 -0800 Introspect reply block types as well 2015-11-09 14:00:37 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca benjamin cmarcelo commit-queue oldest_to_newest 1140475 0 andersca 2015-11-09 12:55:04 -0800 Introspect reply block types as well 1140483 1 265087 andersca 2015-11-09 13:03:17 -0800 Created attachment 265087 Patch 1140509 2 265093 andersca 2015-11-09 13:45:29 -0800 Created attachment 265093 Patch 1140513 3 265093 thorton 2015-11-09 13:54:00 -0800 Comment on attachment 265093 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=265093&action=review > Source/WTF/ChangeLog:3 > + Introspect reply block types as well as well? 1140521 4 andersca 2015-11-09 14:00:37 -0800 Committed r192177: <http://trac.webkit.org/changeset/192177> 265087 2015-11-09 13:03:17 -0800 2015-11-09 13:45:26 -0800 Patch bug-151048-20151109130314.patch text/plain 7108 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyMTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDkwODMzZWQ1ZjNkOWM3NTU0NzQ1YWI4 ZTE1YTkwNWFiZTA0M2I3MDMuLmI5NTZiZWZlNGFmYTIwNjIxNWJhZWVmYTNjOWU0ODRiYTM1MTNk N2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTUtMTEtMDkgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBJbnRyb3NwZWN0IHJlcGx5IGJsb2NrIHR5cGVz IGFzIHdlbGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE1MTA0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEZpeCBvcGVyYXRvci0+IGltcGxlbWVudGF0aW9uLgorCisgICAgICAgICogd3RmL09wdGlvbmFs Lmg6CisgICAgICAgIChXVEY6Ok9wdGlvbmFsOjpvcGVyYXRvci0+KToKKwogMjAxNS0xMS0wNSAg Tmlrb3MgQW5kcm9uaWtvcyAgPG5pa29zLmFuZHJvbmlrb3Mtd2Via2l0QGNpc3JhLmNhbm9uLmNv bS5hdT4KIAogICAgICAgICBBZGQgcnVudGltZSBhbmQgY29tcGlsZSB0aW1lIGZsYWdzIGZvciBl bmFibGluZyBXZWIgQW5pbWF0aW9ucyBBUEkgYW5kIG1vZGVsLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDdlMDEy NjQ1OTE5NzM0MDFmZmJhNjk0NGJlMjM4MjNjODA4YWQ5NjQuLmY1ZGJhYTVkNzllN2ExNzMwOTZh ZWYyZmU1MmViMTcxMTMyMTFlY2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNyBAQAogMjAxNS0x MS0wOSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIElu dHJvc3BlY3QgcmVwbHkgYmxvY2sgdHlwZXMgYXMgd2VsbAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxMDQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvQVBJL0NvY29hL19XS1JlbW90ZU9i amVjdEludGVyZmFjZS5tbToKKyAgICAgICAgKGluaXRpYWxpemVNZXRob2QpOgorICAgICAgICAo aW5pdGlhbGl6ZU1ldGhvZHMpOgorICAgICAgICAoLVtfV0tSZW1vdGVPYmplY3RJbnRlcmZhY2Ug ZGVidWdEZXNjcmlwdGlvbl0pOgorCisyMDE1LTExLTA5ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRl cnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgSW1wbGVtZW50IC1bX1dLUmVtb3RlT2JqZWN0SW50 ZXJmYWNlIGRlYnVnRGVzY3JpcHRpb25dIGFuZCBoYXZlIGl0IGxvb2sgbGlrZSB0aGUgTlNYUENJ bnRlcmZhY2UgZXF1aXZhbGVudAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTUxMDQ0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL09wdGlvbmFs LmggYi9Tb3VyY2UvV1RGL3d0Zi9PcHRpb25hbC5oCmluZGV4IDNiNWM4ZGQwOGYzM2JiOTcwMmM4 ZDRkMmNmMmZiNDJjOTkzZjZiYjUuLjdmNDAwM2YwZjE0MWY5Mjg5NTY2NDU5ODFlMTJjYTU2YmJj YWY4MjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL09wdGlvbmFsLmgKKysrIGIvU291cmNl L1dURi93dGYvT3B0aW9uYWwuaApAQCAtMTM2LDEzICsxMzYsMTMgQEAgcHVibGljOgogICAgIGNv bnN0IFQqIG9wZXJhdG9yLT4oKSBjb25zdAogICAgIHsKICAgICAgICAgQVNTRVJUKG1faXNFbmdh Z2VkKTsKLSAgICAgICAgcmV0dXJuIGFzUHRyKCktPm9wZXJhdG9yLT4oKTsKKyAgICAgICAgcmV0 dXJuIGFzUHRyKCk7CiAgICAgfQogCiAgICAgVCogb3BlcmF0b3ItPigpCiAgICAgewogICAgICAg ICBBU1NFUlQobV9pc0VuZ2FnZWQpOwotICAgICAgICByZXR1cm4gYXNQdHIoKS0+b3BlcmF0b3It PigpOworICAgICAgICByZXR1cm4gYXNQdHIoKTsKICAgICB9CiAKICAgICBjb25zdCBUJiBvcGVy YXRvciooKSBjb25zdCB7IHJldHVybiB2YWx1ZSgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvQVBJL0NvY29hL19XS1JlbW90ZU9iamVjdEludGVyZmFjZS5tbSBiL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9BUEkvQ29jb2EvX1dLUmVtb3RlT2JqZWN0SW50ZXJmYWNlLm1tCmlu ZGV4IGE4ZjQxMDAxNTdkODVkNWFiZWI2ZjU1NGUyMTk1YTFjMzI5NDUwYTAuLjNhMjY2NmM5YjBk MTllODNjYmZhYzVjMzk1ZTBiODBmMzlmMmM0YzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9BUEkvQ29jb2EvX1dLUmVtb3RlT2JqZWN0SW50ZXJmYWNlLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9BUEkvQ29jb2EvX1dLUmVtb3RlT2JqZWN0SW50ZXJmYWNlLm1tCkBA IC0zMSw2ICszMSw3IEBACiAjaW1wb3J0IDxvYmpjL3J1bnRpbWUuaD4KICNpbXBvcnQgPHd0Zi9I YXNoTWFwLmg+CiAjaW1wb3J0IDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KKyNpbXBvcnQgPHd0Zi9P cHRpb25hbC5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgogI2ltcG9ydCA8d3RmL1ZlY3Rv ci5oPgogI2ltcG9ydCA8d3RmL3RleHQvQ1N0cmluZy5oPgpAQCAtMzksMTMgKzQwLDIwIEBAIGV4 dGVybiAiQyIKIGNvbnN0IGNoYXIgKl9wcm90b2NvbF9nZXRNZXRob2RUeXBlRW5jb2RpbmcoUHJv dG9jb2wgKnAsIFNFTCBzZWwsIEJPT0wgaXNSZXF1aXJlZE1ldGhvZCwgQk9PTCBpc0luc3RhbmNl TWV0aG9kKTsKIAogQGludGVyZmFjZSBOU01ldGhvZFNpZ25hdHVyZSAoKQorLSAoTlNNZXRob2RT aWduYXR1cmUgKilfc2lnbmF0dXJlRm9yQmxvY2tBdEFyZ3VtZW50SW5kZXg6KE5TSW50ZWdlcilp ZHg7CiAtIChDbGFzcylfY2xhc3NGb3JPYmplY3RBdEFyZ3VtZW50SW5kZXg6KE5TSW50ZWdlcilp ZHg7CistIChOU1N0cmluZyAqKV90eXBlU3RyaW5nOwogQGVuZAogCiBzdHJ1Y3QgTWV0aG9kSW5m byB7CiAgICAgVmVjdG9yPEhhc2hTZXQ8Q2xhc3M+PiBhbGxvd2VkQXJndW1lbnRDbGFzc2VzOwog Ci0gICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGhhdmUgYWxsb3dlZCByZXBseSBhcmd1bWVudCBj bGFzc2VzIHRvby4KKyAgICBzdHJ1Y3QgUmVwbHlJbmZvIHsKKyAgICAgICAgTlNVSW50ZWdlciBy ZXBseVBvc2l0aW9uOworICAgICAgICBDU3RyaW5nIHJlcGx5U2lnbmF0dXJlOworICAgICAgICBW ZWN0b3I8SGFzaFNldDxDbGFzcz4+IGFsbG93ZWRSZXBseUNsYXNzZXM7CisgICAgfTsKKyAgICBP cHRpb25hbDxSZXBseUluZm8+IHJlcGx5SW5mbzsKIH07CiAKIEBpbXBsZW1lbnRhdGlvbiBfV0tS ZW1vdGVPYmplY3RJbnRlcmZhY2UgewpAQCAtNzcsMTMgKzg1LDE0IEBAIHN0YXRpYyBIYXNoU2V0 PENsYXNzPiYgcHJvcGVydHlMaXN0Q2xhc3NlcygpCiAgICAgcmV0dXJuIHByb3BlcnR5TGlzdENs YXNzZXM7CiB9CiAKLXN0YXRpYyB2b2lkIGluaXRpYWxpemVNZXRob2QoTWV0aG9kSW5mbyYgbWV0 aG9kSW5mbywgTlNNZXRob2RTaWduYXR1cmUgKm1ldGhvZFNpZ25hdHVyZSwgYm9vbCBmb3JSZXBs eUJsb2NrKQorc3RhdGljIHZvaWQgaW5pdGlhbGl6ZU1ldGhvZChNZXRob2RJbmZvJiBtZXRob2RJ bmZvLCBQcm90b2NvbCAqcHJvdG9jb2wsIFNFTCBzZWxlY3RvciwgTlNNZXRob2RTaWduYXR1cmUg Km1ldGhvZFNpZ25hdHVyZSwgYm9vbCBmb3JSZXBseUJsb2NrKQogewogICAgIFZlY3RvcjxIYXNo U2V0PENsYXNzPj4gYWxsb3dlZENsYXNzZXM7CiAKICAgICBOU1VJbnRlZ2VyIGZpcnN0QXJndW1l bnQgPSBmb3JSZXBseUJsb2NrID8gMSA6IDI7CiAgICAgTlNVSW50ZWdlciBhcmd1bWVudENvdW50 ID0gbWV0aG9kU2lnbmF0dXJlLm51bWJlck9mQXJndW1lbnRzOwogCisgICAgYm9vbCBmb3VuZEJs b2NrID0gZmFsc2U7CiAgICAgZm9yIChOU1VJbnRlZ2VyIGkgPSBmaXJzdEFyZ3VtZW50OyBpIDwg YXJndW1lbnRDb3VudDsgKytpKSB7CiAgICAgICAgIGNvbnN0IGNoYXIqIGFyZ3VtZW50VHlwZSA9 IFttZXRob2RTaWduYXR1cmUgZ2V0QXJndW1lbnRUeXBlQXRJbmRleDppXTsKIApAQCAtOTMsNiAr MTAyLDIzIEBAIHN0YXRpYyB2b2lkIGluaXRpYWxpemVNZXRob2QoTWV0aG9kSW5mbyYgbWV0aG9k SW5mbywgTlNNZXRob2RTaWduYXR1cmUgKm1ldGhvZFNpCiAgICAgICAgICAgICBjb250aW51ZTsK ICAgICAgICAgfQogCisgICAgICAgIGlmICgqKGFyZ3VtZW50VHlwZSArIDEpID09ICc/Jykgewor ICAgICAgICAgICAgaWYgKGZvclJlcGx5QmxvY2spCisgICAgICAgICAgICAgICAgW05TRXhjZXB0 aW9uIHJhaXNlOk5TSW52YWxpZEFyZ3VtZW50RXhjZXB0aW9uIGZvcm1hdDpAIkJsb2NrcyBhcyBh cmd1bWVudHMgdG8gdGhlIHJlcGx5IGJsb2NrIG9mIG1ldGhvZCAoJXMgLyAlcykgYXJlIG5vdCBh bGxvd2VkIiwgcHJvdG9jb2xfZ2V0TmFtZShwcm90b2NvbCksIHNlbF9nZXROYW1lKHNlbGVjdG9y KV07CisKKyAgICAgICAgICAgIGlmIChmb3VuZEJsb2NrKQorICAgICAgICAgICAgICAgIFtOU0V4 Y2VwdGlvbiByYWlzZTpOU0ludmFsaWRBcmd1bWVudEV4Y2VwdGlvbiBmb3JtYXQ6QCJPbmx5IG9u ZSByZXBseSBibG9jayBpcyBhbGxvd2VkIHBlciBtZXRob2QgKCVzIC8gJXMpIiwgcHJvdG9jb2xf Z2V0TmFtZShwcm90b2NvbCksIHNlbF9nZXROYW1lKHNlbGVjdG9yKV07CisgICAgICAgICAgICBm b3VuZEJsb2NrID0gdHJ1ZTsKKyAgICAgICAgICAgIE5TTWV0aG9kU2lnbmF0dXJlICpibG9ja1Np Z25hdHVyZSA9IFttZXRob2RTaWduYXR1cmUgX3NpZ25hdHVyZUZvckJsb2NrQXRBcmd1bWVudElu ZGV4OmldOworICAgICAgICAgICAgQVNTRVJUKGJsb2NrU2lnbmF0dXJlLl90eXBlU3RyaW5nKTsK KworICAgICAgICAgICAgbWV0aG9kSW5mby5yZXBseUluZm8gPSBNZXRob2RJbmZvOjpSZXBseUlu Zm8oKTsKKyAgICAgICAgICAgIG1ldGhvZEluZm8ucmVwbHlJbmZvLT5yZXBseVBvc2l0aW9uID0g aTsKKyAgICAgICAgICAgIG1ldGhvZEluZm8ucmVwbHlJbmZvLT5yZXBseVNpZ25hdHVyZSA9IGJs b2NrU2lnbmF0dXJlLl90eXBlU3RyaW5nLlVURjhTdHJpbmc7CisKKyAgICAgICAgICAgIGluaXRp YWxpemVNZXRob2QobWV0aG9kSW5mbywgcHJvdG9jb2wsIHNlbGVjdG9yLCBibG9ja1NpZ25hdHVy ZSwgdHJ1ZSk7CisgICAgICAgIH0KKwogICAgICAgICBDbGFzcyBvYmplY3RDbGFzcyA9IFttZXRo b2RTaWduYXR1cmUgX2NsYXNzRm9yT2JqZWN0QXRBcmd1bWVudEluZGV4OmldOwogICAgICAgICBp ZiAoIW9iamVjdENsYXNzKSB7CiAgICAgICAgICAgICBhbGxvd2VkQ2xhc3Nlcy5hcHBlbmQoeyB9 KTsKQEAgLTEwOCw3ICsxMzQsMTAgQEAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZU1ldGhvZChNZXRo b2RJbmZvJiBtZXRob2RJbmZvLCBOU01ldGhvZFNpZ25hdHVyZSAqbWV0aG9kU2kKICAgICAgICAg YWxsb3dlZENsYXNzZXMuYXBwZW5kKHsgb2JqZWN0Q2xhc3MgfSk7CiAgICAgfQogCi0gICAgbWV0 aG9kSW5mby5hbGxvd2VkQXJndW1lbnRDbGFzc2VzID0gV1RGOjptb3ZlKGFsbG93ZWRDbGFzc2Vz KTsKKyAgICBpZiAoZm9yUmVwbHlCbG9jaykKKyAgICAgICAgbWV0aG9kSW5mby5yZXBseUluZm8t PmFsbG93ZWRSZXBseUNsYXNzZXMgPSBXVEY6Om1vdmUoYWxsb3dlZENsYXNzZXMpOworICAgIGVs c2UKKyAgICAgICAgbWV0aG9kSW5mby5hbGxvd2VkQXJndW1lbnRDbGFzc2VzID0gV1RGOjptb3Zl KGFsbG93ZWRDbGFzc2VzKTsKIH0KIAogc3RhdGljIHZvaWQgaW5pdGlhbGl6ZU1ldGhvZHMoX1dL UmVtb3RlT2JqZWN0SW50ZXJmYWNlICppbnRlcmZhY2UsIFByb3RvY29sICpwcm90b2NvbCwgYm9v bCByZXF1aXJlZE1ldGhvZHMpCkBAIC0xMjgsNyArMTU3LDcgQEAgc3RhdGljIHZvaWQgaW5pdGlh bGl6ZU1ldGhvZHMoX1dLUmVtb3RlT2JqZWN0SW50ZXJmYWNlICppbnRlcmZhY2UsIFByb3RvY29s ICpwcm8KIAogICAgICAgICBOU01ldGhvZFNpZ25hdHVyZSAqbWV0aG9kU2lnbmF0dXJlID0gW05T TWV0aG9kU2lnbmF0dXJlIHNpZ25hdHVyZVdpdGhPYmpDVHlwZXM6bWV0aG9kVHlwZUVuY29kaW5n XTsKIAotICAgICAgICBpbml0aWFsaXplTWV0aG9kKG1ldGhvZEluZm8sIG1ldGhvZFNpZ25hdHVy ZSwgZmFsc2UpOworICAgICAgICBpbml0aWFsaXplTWV0aG9kKG1ldGhvZEluZm8sIHByb3RvY29s LCBzZWxlY3RvciwgbWV0aG9kU2lnbmF0dXJlLCBmYWxzZSk7CiAgICAgfQogCiAgICAgZnJlZSht ZXRob2RzKTsKQEAgLTIyMCw5ICsyNDksMTMgQEAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZU1ldGhv ZHMoX1dLUmVtb3RlT2JqZWN0SW50ZXJmYWNlICppbnRlcmZhY2UsIFByb3RvY29sICpwcm8KICAg ICAgICAgcmV0dXJuIHJlc3VsdC5hdXRvcmVsZWFzZSgpOwogICAgIH07CiAKLSAgICBmb3IgKGF1 dG8mIHNlbGVjdG9yQW5kTWV0aG9kIDogX21ldGhvZHMpCisgICAgZm9yIChhdXRvJiBzZWxlY3Rv ckFuZE1ldGhvZCA6IF9tZXRob2RzKSB7CiAgICAgICAgIFtyZXN1bHQgYXBwZW5kRm9ybWF0OkAi IHNlbGVjdG9yID0gJXNcbiAgYXJndW1lbnQgY2xhc3NlcyA9ICVAXG4iLCBzZWxfZ2V0TmFtZShz ZWxlY3RvckFuZE1ldGhvZC5rZXkpLCBkZXNjcmlwdGlvbkZvckNsYXNzZXMoc2VsZWN0b3JBbmRN ZXRob2QudmFsdWUuYWxsb3dlZEFyZ3VtZW50Q2xhc3NlcyldOwogCisgICAgICAgIGlmIChhdXRv IHJlcGx5SW5mbyA9IHNlbGVjdG9yQW5kTWV0aG9kLnZhbHVlLnJlcGx5SW5mbykKKyAgICAgICAg ICAgIFtyZXN1bHQgYXBwZW5kRm9ybWF0OkAiICByZXBseSBibG9jayA9IChhcmd1bWVudCAjJXp1 ICclcycpICVAXG4iLCByZXBseUluZm8tPnJlcGx5UG9zaXRpb24sIHJlcGx5SW5mby0+cmVwbHlT aWduYXR1cmUuZGF0YSgpLCBkZXNjcmlwdGlvbkZvckNsYXNzZXMocmVwbHlJbmZvLT5hbGxvd2Vk UmVwbHlDbGFzc2VzKV07CisgICAgfQorCiAgICAgW3Jlc3VsdCBhcHBlbmRTdHJpbmc6QCI+XG4i XTsKICAgICByZXR1cm4gcmVzdWx0LmF1dG9yZWxlYXNlKCk7CiB9Cg== 265093 2015-11-09 13:45:29 -0800 2015-11-09 13:54:00 -0800 Patch bug-151048-20151109134525.patch text/plain 7136 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyMTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDkwODMzZWQ1ZjNkOWM3NTU0NzQ1YWI4 ZTE1YTkwNWFiZTA0M2I3MDMuLmI5NTZiZWZlNGFmYTIwNjIxNWJhZWVmYTNjOWU0ODRiYTM1MTNk N2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTUtMTEtMDkgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBJbnRyb3NwZWN0IHJlcGx5IGJsb2NrIHR5cGVz IGFzIHdlbGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE1MTA0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEZpeCBvcGVyYXRvci0+IGltcGxlbWVudGF0aW9uLgorCisgICAgICAgICogd3RmL09wdGlvbmFs Lmg6CisgICAgICAgIChXVEY6Ok9wdGlvbmFsOjpvcGVyYXRvci0+KToKKwogMjAxNS0xMS0wNSAg Tmlrb3MgQW5kcm9uaWtvcyAgPG5pa29zLmFuZHJvbmlrb3Mtd2Via2l0QGNpc3JhLmNhbm9uLmNv bS5hdT4KIAogICAgICAgICBBZGQgcnVudGltZSBhbmQgY29tcGlsZSB0aW1lIGZsYWdzIGZvciBl bmFibGluZyBXZWIgQW5pbWF0aW9ucyBBUEkgYW5kIG1vZGVsLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDdlMDEy NjQ1OTE5NzM0MDFmZmJhNjk0NGJlMjM4MjNjODA4YWQ5NjQuLmY1ZGJhYTVkNzllN2ExNzMwOTZh ZWYyZmU1MmViMTcxMTMyMTFlY2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNyBAQAogMjAxNS0x MS0wOSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIElu dHJvc3BlY3QgcmVwbHkgYmxvY2sgdHlwZXMgYXMgd2VsbAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxMDQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvQVBJL0NvY29hL19XS1JlbW90ZU9i amVjdEludGVyZmFjZS5tbToKKyAgICAgICAgKGluaXRpYWxpemVNZXRob2QpOgorICAgICAgICAo aW5pdGlhbGl6ZU1ldGhvZHMpOgorICAgICAgICAoLVtfV0tSZW1vdGVPYmplY3RJbnRlcmZhY2Ug ZGVidWdEZXNjcmlwdGlvbl0pOgorCisyMDE1LTExLTA5ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRl cnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgSW1wbGVtZW50IC1bX1dLUmVtb3RlT2JqZWN0SW50 ZXJmYWNlIGRlYnVnRGVzY3JpcHRpb25dIGFuZCBoYXZlIGl0IGxvb2sgbGlrZSB0aGUgTlNYUENJ bnRlcmZhY2UgZXF1aXZhbGVudAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTUxMDQ0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL09wdGlvbmFs LmggYi9Tb3VyY2UvV1RGL3d0Zi9PcHRpb25hbC5oCmluZGV4IDNiNWM4ZGQwOGYzM2JiOTcwMmM4 ZDRkMmNmMmZiNDJjOTkzZjZiYjUuLjdmNDAwM2YwZjE0MWY5Mjg5NTY2NDU5ODFlMTJjYTU2YmJj YWY4MjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL09wdGlvbmFsLmgKKysrIGIvU291cmNl L1dURi93dGYvT3B0aW9uYWwuaApAQCAtMTM2LDEzICsxMzYsMTMgQEAgcHVibGljOgogICAgIGNv bnN0IFQqIG9wZXJhdG9yLT4oKSBjb25zdAogICAgIHsKICAgICAgICAgQVNTRVJUKG1faXNFbmdh Z2VkKTsKLSAgICAgICAgcmV0dXJuIGFzUHRyKCktPm9wZXJhdG9yLT4oKTsKKyAgICAgICAgcmV0 dXJuIGFzUHRyKCk7CiAgICAgfQogCiAgICAgVCogb3BlcmF0b3ItPigpCiAgICAgewogICAgICAg ICBBU1NFUlQobV9pc0VuZ2FnZWQpOwotICAgICAgICByZXR1cm4gYXNQdHIoKS0+b3BlcmF0b3It PigpOworICAgICAgICByZXR1cm4gYXNQdHIoKTsKICAgICB9CiAKICAgICBjb25zdCBUJiBvcGVy YXRvciooKSBjb25zdCB7IHJldHVybiB2YWx1ZSgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvQVBJL0NvY29hL19XS1JlbW90ZU9iamVjdEludGVyZmFjZS5tbSBiL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9BUEkvQ29jb2EvX1dLUmVtb3RlT2JqZWN0SW50ZXJmYWNlLm1tCmlu ZGV4IGE4ZjQxMDAxNTdkODVkNWFiZWI2ZjU1NGUyMTk1YTFjMzI5NDUwYTAuLmNmMDdmYTlkODU5 MzYzMDZmYWEwMTRkY2FmNmVhMjc5ZDM0MjIzMGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9BUEkvQ29jb2EvX1dLUmVtb3RlT2JqZWN0SW50ZXJmYWNlLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9BUEkvQ29jb2EvX1dLUmVtb3RlT2JqZWN0SW50ZXJmYWNlLm1tCkBA IC0zMSw2ICszMSw3IEBACiAjaW1wb3J0IDxvYmpjL3J1bnRpbWUuaD4KICNpbXBvcnQgPHd0Zi9I YXNoTWFwLmg+CiAjaW1wb3J0IDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KKyNpbXBvcnQgPHd0Zi9P cHRpb25hbC5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgogI2ltcG9ydCA8d3RmL1ZlY3Rv ci5oPgogI2ltcG9ydCA8d3RmL3RleHQvQ1N0cmluZy5oPgpAQCAtMzksMTMgKzQwLDIwIEBAIGV4 dGVybiAiQyIKIGNvbnN0IGNoYXIgKl9wcm90b2NvbF9nZXRNZXRob2RUeXBlRW5jb2RpbmcoUHJv dG9jb2wgKnAsIFNFTCBzZWwsIEJPT0wgaXNSZXF1aXJlZE1ldGhvZCwgQk9PTCBpc0luc3RhbmNl TWV0aG9kKTsKIAogQGludGVyZmFjZSBOU01ldGhvZFNpZ25hdHVyZSAoKQorLSAoTlNNZXRob2RT aWduYXR1cmUgKilfc2lnbmF0dXJlRm9yQmxvY2tBdEFyZ3VtZW50SW5kZXg6KE5TSW50ZWdlcilp ZHg7CiAtIChDbGFzcylfY2xhc3NGb3JPYmplY3RBdEFyZ3VtZW50SW5kZXg6KE5TSW50ZWdlcilp ZHg7CistIChOU1N0cmluZyAqKV90eXBlU3RyaW5nOwogQGVuZAogCiBzdHJ1Y3QgTWV0aG9kSW5m byB7CiAgICAgVmVjdG9yPEhhc2hTZXQ8Q2xhc3M+PiBhbGxvd2VkQXJndW1lbnRDbGFzc2VzOwog Ci0gICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGhhdmUgYWxsb3dlZCByZXBseSBhcmd1bWVudCBj bGFzc2VzIHRvby4KKyAgICBzdHJ1Y3QgUmVwbHlJbmZvIHsKKyAgICAgICAgTlNVSW50ZWdlciBy ZXBseVBvc2l0aW9uOworICAgICAgICBDU3RyaW5nIHJlcGx5U2lnbmF0dXJlOworICAgICAgICBW ZWN0b3I8SGFzaFNldDxDbGFzcz4+IGFsbG93ZWRSZXBseUNsYXNzZXM7CisgICAgfTsKKyAgICBP cHRpb25hbDxSZXBseUluZm8+IHJlcGx5SW5mbzsKIH07CiAKIEBpbXBsZW1lbnRhdGlvbiBfV0tS ZW1vdGVPYmplY3RJbnRlcmZhY2UgewpAQCAtNzcsMTMgKzg1LDE0IEBAIHN0YXRpYyBIYXNoU2V0 PENsYXNzPiYgcHJvcGVydHlMaXN0Q2xhc3NlcygpCiAgICAgcmV0dXJuIHByb3BlcnR5TGlzdENs YXNzZXM7CiB9CiAKLXN0YXRpYyB2b2lkIGluaXRpYWxpemVNZXRob2QoTWV0aG9kSW5mbyYgbWV0 aG9kSW5mbywgTlNNZXRob2RTaWduYXR1cmUgKm1ldGhvZFNpZ25hdHVyZSwgYm9vbCBmb3JSZXBs eUJsb2NrKQorc3RhdGljIHZvaWQgaW5pdGlhbGl6ZU1ldGhvZChNZXRob2RJbmZvJiBtZXRob2RJ bmZvLCBQcm90b2NvbCAqcHJvdG9jb2wsIFNFTCBzZWxlY3RvciwgTlNNZXRob2RTaWduYXR1cmUg Km1ldGhvZFNpZ25hdHVyZSwgYm9vbCBmb3JSZXBseUJsb2NrKQogewogICAgIFZlY3RvcjxIYXNo U2V0PENsYXNzPj4gYWxsb3dlZENsYXNzZXM7CiAKICAgICBOU1VJbnRlZ2VyIGZpcnN0QXJndW1l bnQgPSBmb3JSZXBseUJsb2NrID8gMSA6IDI7CiAgICAgTlNVSW50ZWdlciBhcmd1bWVudENvdW50 ID0gbWV0aG9kU2lnbmF0dXJlLm51bWJlck9mQXJndW1lbnRzOwogCisgICAgYm9vbCBmb3VuZEJs b2NrID0gZmFsc2U7CiAgICAgZm9yIChOU1VJbnRlZ2VyIGkgPSBmaXJzdEFyZ3VtZW50OyBpIDwg YXJndW1lbnRDb3VudDsgKytpKSB7CiAgICAgICAgIGNvbnN0IGNoYXIqIGFyZ3VtZW50VHlwZSA9 IFttZXRob2RTaWduYXR1cmUgZ2V0QXJndW1lbnRUeXBlQXRJbmRleDppXTsKIApAQCAtOTMsNiAr MTAyLDIzIEBAIHN0YXRpYyB2b2lkIGluaXRpYWxpemVNZXRob2QoTWV0aG9kSW5mbyYgbWV0aG9k SW5mbywgTlNNZXRob2RTaWduYXR1cmUgKm1ldGhvZFNpCiAgICAgICAgICAgICBjb250aW51ZTsK ICAgICAgICAgfQogCisgICAgICAgIGlmICgqKGFyZ3VtZW50VHlwZSArIDEpID09ICc/Jykgewor ICAgICAgICAgICAgaWYgKGZvclJlcGx5QmxvY2spCisgICAgICAgICAgICAgICAgW05TRXhjZXB0 aW9uIHJhaXNlOk5TSW52YWxpZEFyZ3VtZW50RXhjZXB0aW9uIGZvcm1hdDpAIkJsb2NrcyBhcyBh cmd1bWVudHMgdG8gdGhlIHJlcGx5IGJsb2NrIG9mIG1ldGhvZCAoJXMgLyAlcykgYXJlIG5vdCBh bGxvd2VkIiwgcHJvdG9jb2xfZ2V0TmFtZShwcm90b2NvbCksIHNlbF9nZXROYW1lKHNlbGVjdG9y KV07CisKKyAgICAgICAgICAgIGlmIChmb3VuZEJsb2NrKQorICAgICAgICAgICAgICAgIFtOU0V4 Y2VwdGlvbiByYWlzZTpOU0ludmFsaWRBcmd1bWVudEV4Y2VwdGlvbiBmb3JtYXQ6QCJPbmx5IG9u ZSByZXBseSBibG9jayBpcyBhbGxvd2VkIHBlciBtZXRob2QgKCVzIC8gJXMpIiwgcHJvdG9jb2xf Z2V0TmFtZShwcm90b2NvbCksIHNlbF9nZXROYW1lKHNlbGVjdG9yKV07CisgICAgICAgICAgICBm b3VuZEJsb2NrID0gdHJ1ZTsKKyAgICAgICAgICAgIE5TTWV0aG9kU2lnbmF0dXJlICpibG9ja1Np Z25hdHVyZSA9IFttZXRob2RTaWduYXR1cmUgX3NpZ25hdHVyZUZvckJsb2NrQXRBcmd1bWVudElu ZGV4OmldOworICAgICAgICAgICAgQVNTRVJUKGJsb2NrU2lnbmF0dXJlLl90eXBlU3RyaW5nKTsK KworICAgICAgICAgICAgbWV0aG9kSW5mby5yZXBseUluZm8gPSBNZXRob2RJbmZvOjpSZXBseUlu Zm8oKTsKKyAgICAgICAgICAgIG1ldGhvZEluZm8ucmVwbHlJbmZvLT5yZXBseVBvc2l0aW9uID0g aTsKKyAgICAgICAgICAgIG1ldGhvZEluZm8ucmVwbHlJbmZvLT5yZXBseVNpZ25hdHVyZSA9IGJs b2NrU2lnbmF0dXJlLl90eXBlU3RyaW5nLlVURjhTdHJpbmc7CisKKyAgICAgICAgICAgIGluaXRp YWxpemVNZXRob2QobWV0aG9kSW5mbywgcHJvdG9jb2wsIHNlbGVjdG9yLCBibG9ja1NpZ25hdHVy ZSwgdHJ1ZSk7CisgICAgICAgIH0KKwogICAgICAgICBDbGFzcyBvYmplY3RDbGFzcyA9IFttZXRo b2RTaWduYXR1cmUgX2NsYXNzRm9yT2JqZWN0QXRBcmd1bWVudEluZGV4OmldOwogICAgICAgICBp ZiAoIW9iamVjdENsYXNzKSB7CiAgICAgICAgICAgICBhbGxvd2VkQ2xhc3Nlcy5hcHBlbmQoeyB9 KTsKQEAgLTEwOCw3ICsxMzQsMTAgQEAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZU1ldGhvZChNZXRo b2RJbmZvJiBtZXRob2RJbmZvLCBOU01ldGhvZFNpZ25hdHVyZSAqbWV0aG9kU2kKICAgICAgICAg YWxsb3dlZENsYXNzZXMuYXBwZW5kKHsgb2JqZWN0Q2xhc3MgfSk7CiAgICAgfQogCi0gICAgbWV0 aG9kSW5mby5hbGxvd2VkQXJndW1lbnRDbGFzc2VzID0gV1RGOjptb3ZlKGFsbG93ZWRDbGFzc2Vz KTsKKyAgICBpZiAoZm9yUmVwbHlCbG9jaykKKyAgICAgICAgbWV0aG9kSW5mby5yZXBseUluZm8t PmFsbG93ZWRSZXBseUNsYXNzZXMgPSBXVEY6Om1vdmUoYWxsb3dlZENsYXNzZXMpOworICAgIGVs c2UKKyAgICAgICAgbWV0aG9kSW5mby5hbGxvd2VkQXJndW1lbnRDbGFzc2VzID0gV1RGOjptb3Zl KGFsbG93ZWRDbGFzc2VzKTsKIH0KIAogc3RhdGljIHZvaWQgaW5pdGlhbGl6ZU1ldGhvZHMoX1dL UmVtb3RlT2JqZWN0SW50ZXJmYWNlICppbnRlcmZhY2UsIFByb3RvY29sICpwcm90b2NvbCwgYm9v bCByZXF1aXJlZE1ldGhvZHMpCkBAIC0xMjgsNyArMTU3LDcgQEAgc3RhdGljIHZvaWQgaW5pdGlh bGl6ZU1ldGhvZHMoX1dLUmVtb3RlT2JqZWN0SW50ZXJmYWNlICppbnRlcmZhY2UsIFByb3RvY29s ICpwcm8KIAogICAgICAgICBOU01ldGhvZFNpZ25hdHVyZSAqbWV0aG9kU2lnbmF0dXJlID0gW05T TWV0aG9kU2lnbmF0dXJlIHNpZ25hdHVyZVdpdGhPYmpDVHlwZXM6bWV0aG9kVHlwZUVuY29kaW5n XTsKIAotICAgICAgICBpbml0aWFsaXplTWV0aG9kKG1ldGhvZEluZm8sIG1ldGhvZFNpZ25hdHVy ZSwgZmFsc2UpOworICAgICAgICBpbml0aWFsaXplTWV0aG9kKG1ldGhvZEluZm8sIHByb3RvY29s LCBzZWxlY3RvciwgbWV0aG9kU2lnbmF0dXJlLCBmYWxzZSk7CiAgICAgfQogCiAgICAgZnJlZSht ZXRob2RzKTsKQEAgLTIyMCw5ICsyNDksMTMgQEAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZU1ldGhv ZHMoX1dLUmVtb3RlT2JqZWN0SW50ZXJmYWNlICppbnRlcmZhY2UsIFByb3RvY29sICpwcm8KICAg ICAgICAgcmV0dXJuIHJlc3VsdC5hdXRvcmVsZWFzZSgpOwogICAgIH07CiAKLSAgICBmb3IgKGF1 dG8mIHNlbGVjdG9yQW5kTWV0aG9kIDogX21ldGhvZHMpCisgICAgZm9yIChhdXRvJiBzZWxlY3Rv ckFuZE1ldGhvZCA6IF9tZXRob2RzKSB7CiAgICAgICAgIFtyZXN1bHQgYXBwZW5kRm9ybWF0OkAi IHNlbGVjdG9yID0gJXNcbiAgYXJndW1lbnQgY2xhc3NlcyA9ICVAXG4iLCBzZWxfZ2V0TmFtZShz ZWxlY3RvckFuZE1ldGhvZC5rZXkpLCBkZXNjcmlwdGlvbkZvckNsYXNzZXMoc2VsZWN0b3JBbmRN ZXRob2QudmFsdWUuYWxsb3dlZEFyZ3VtZW50Q2xhc3NlcyldOwogCisgICAgICAgIGlmIChhdXRv IHJlcGx5SW5mbyA9IHNlbGVjdG9yQW5kTWV0aG9kLnZhbHVlLnJlcGx5SW5mbykKKyAgICAgICAg ICAgIFtyZXN1bHQgYXBwZW5kRm9ybWF0OkAiICByZXBseSBibG9jayA9IChhcmd1bWVudCAjJWx1 ICclcycpICVAXG4iLCBzdGF0aWNfY2FzdDx1bnNpZ25lZCBsb25nPihyZXBseUluZm8tPnJlcGx5 UG9zaXRpb24pLCByZXBseUluZm8tPnJlcGx5U2lnbmF0dXJlLmRhdGEoKSwgZGVzY3JpcHRpb25G b3JDbGFzc2VzKHJlcGx5SW5mby0+YWxsb3dlZFJlcGx5Q2xhc3NlcyldOworICAgIH0KKwogICAg IFtyZXN1bHQgYXBwZW5kU3RyaW5nOkAiPlxuIl07CiAgICAgcmV0dXJuIHJlc3VsdC5hdXRvcmVs ZWFzZSgpOwogfQo=