88993 2012-06-13 05:38:21 -0700 [Qt] Remove dependency to QtScript for the Qt 5 build 2012-06-13 08:14:15 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hausmann hausmann webkit.review.bot oldest_to_newest 647941 0 hausmann 2012-06-13 05:38:21 -0700 [Qt] Remove dependency to QtScript for the Qt 5 build 647958 1 147305 hausmann 2012-06-13 06:01:56 -0700 Created attachment 147305 Patch 647959 2 147305 kenneth 2012-06-13 06:03:55 -0700 Comment on attachment 147305 Patch rs=me 647962 3 webkit.review.bot 2012-06-13 06:05:06 -0700 Attachment 147305 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit/qt/Api/qwebframe.h:143: The parameter name "object" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit/qt/Api/qwebframe.h:143: The parameter name "ownership" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit/qt/Api/qwebframe.h:145: The parameter name "object" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit/qt/Api/qwebframe.h:145: The parameter name "ownership" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 4 in 11 files If any of these errors are false positives, please file a bug against check-webkit-style. 647965 4 147305 lars.knoll 2012-06-13 06:15:45 -0700 Comment on attachment 147305 Patch Looks good. 648035 5 hausmann 2012-06-13 08:14:15 -0700 Committed r120196: <http://trac.webkit.org/changeset/120196> 147305 2012-06-13 06:01:56 -0700 2012-06-13 06:15:45 -0700 Patch bug-88993-20120613150154.patch text/plain 18595 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGFkNGExYWIzZWE3Nzk0 ZTkxN2M0NTM1MjJiNGM5M2M3YTQ5Yzg2NS4uZmM4YTU0YzczNzEzM2EwODJmZGRjOTU4YmU0ZDM2 MDYxZWM2YmRjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTA2LTEzICBTaW1v biBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdIFJl bW92ZSBkZXBlbmRlbmN5IHRvIFF0U2NyaXB0IGZvciB0aGUgUXQgNSBidWlsZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg5OTMKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXBsYWNlIHRoZSB1c2Ugb2Yg UVNjcmlwdEVuZ2luZTo6VmFsdWVPd25lcnNoaXAgd2l0aCBhbiBlbnVtIGxvY2FsCisgICAgICAg IHRvIHRoZSBjbGFzcyB3aGVyZSBpdCBpcyB1c2VkIChRdEluc3RhbmNlKS4KKworICAgICAgICAq IFRhcmdldC5wcmk6CisgICAgICAgICogYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlclF0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdENvbnRyb2xsZXI6OmNyZWF0ZVNjcmlwdEluc3Rh bmNlRm9yV2lkZ2V0KToKKyAgICAgICAgKiBicmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwOgorICAg ICAgICAoSlNDOjpCaW5kaW5nczo6UXRJbnN0YW5jZTo6UXRJbnN0YW5jZSk6CisgICAgICAgIChK U0M6OkJpbmRpbmdzOjpRdEluc3RhbmNlOjp+UXRJbnN0YW5jZSk6CisgICAgICAgIChKU0M6OkJp bmRpbmdzOjpRdEluc3RhbmNlOjpnZXRRdEluc3RhbmNlKToKKyAgICAgICAgKiBicmlkZ2UvcXQv cXRfaW5zdGFuY2UuaDoKKyAgICAgICAgKFF0SW5zdGFuY2UpOgorICAgICAgICAoSlNDOjpCaW5k aW5nczo6UXRJbnN0YW5jZTo6Y3JlYXRlKToKKyAgICAgICAgKiBicmlkZ2UvcXQvcXRfcnVudGlt ZS5jcHA6CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpjb252ZXJ0UVZhcmlhbnRUb1ZhbHVlKToK KyAgICAgICAgKiBicmlkZ2UvcXQvcXRfcnVudGltZV9xdDQuY3BwOgorICAgICAgICAoSlNDOjpC aW5kaW5nczo6Y29udmVydFFWYXJpYW50VG9WYWx1ZSk6CisKIDIwMTItMDYtMTEgIEtpbnVrbyBZ YXN1ZGEgIDxraW51a29AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucHJlZml4IEJsb2Iud2Vi a2l0U2xpY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggNGZiMzYzNTVkMTVlMTBiM2UwYTQ3OWQzNjYwNWMz ZGJlYTMwYWExNi4uZGFkMWFhZmM3NDRlMDFiMWVkMzJjZTU4ZGI0ZGFjYTUxNjIxNjQxYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMi0wNi0xMyAgU2ltb24gSGF1c21hbm4g IDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XSBSZW1vdmUgZGVwZW5k ZW5jeSB0byBRdFNjcmlwdCBmb3IgdGhlIFF0IDUgYnVpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4OTkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBidWlsZGluZyBhZ2FpbnN0IFF0IDUsIHJl cGxhY2UgdGhlIHVzZSBvZiBRU2NyaXB0RW5naW5lOjpWYWx1ZU93bmVyc2hpcCB3aXRoCisgICAg ICAgIGEgKGNvbXBhdGlibGUpIFFXZWJGcmFtZTo6VmFsdWVPd25lcnNoaXAgZW51bS4KKworICAg ICAgICAqIEFwaS9xd2ViZnJhbWUuY3BwOgorICAgICAgICAocXRTZW5kZXJDYWxsYmFjayk6Cisg ICAgICAgIChRV2ViRnJhbWU6OmFkZFRvSmF2YVNjcmlwdFdpbmRvd09iamVjdCk6CisgICAgICAg ICogQXBpL3F3ZWJmcmFtZS5oOgorICAgICAgICAqIHRlc3RzL3FvYmplY3RicmlkZ2UvdHN0X3Fv YmplY3RicmlkZ2UuY3BwOgorICAgICAgICAodHN0X1FPYmplY3RCcmlkZ2U6OmFycmF5T2JqZWN0 RW51bWVyYWJsZSk6CisgICAgICAgICh0c3RfUU9iamVjdEJyaWRnZTo6b3duZXJzaGlwKToKKyAg ICAgICAgKHRzdF9RT2JqZWN0QnJpZGdlOjpxT2JqZWN0V3JhcHBlcldpdGhTYW1lSWRlbnRpdHkp OgorCisKIDIwMTItMDYtMTIgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4K IAogICAgICAgICBbUXRdW01hY10gVW5yZXZpZXdlZCBidWlsZGZpeCBhZnRlciByMTIwMDc2Lgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvVGFyZ2V0LnByaSBiL1NvdXJjZS9XZWJDb3JlL1Rh cmdldC5wcmkKaW5kZXggMzdiYjZiYjhiMzNlYzk0Njc3MzQ4ODU4M2EzOTRiN2UwNWVmZTkyYy4u Y2ZjNGYwYjc1NWQ1NTNjOGE3ZTBhMWFjNzg3OTA3MDEwYzE3MTJlOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvVGFyZ2V0LnByaQorKysgYi9Tb3VyY2UvV2ViQ29yZS9UYXJnZXQucHJpCkBA IC0xNiwxMSArMTYsNyBAQCBDT05GSUcgKz0gc3RhdGljbGliCiAKIERFRklORVMgKz0gUVRfTUFL RURMTAogCi1oYXZlUXQoNSkgewotICAgICMgQWRkIGEgUXRTY3JpcHQgZGVwZW5kZW5jeSBmb3Ig dGhlIHRpbWUgYmVpbmcsIGluIG9yZGVyIHRvIHB1bGwgaW4gdGhlIGluY2x1ZGUKLSAgICAjIHBh dGggZm9yIFF0U2NyaXB0IHdoZW4gaXQncyBidWlsdCBhcyBhIHN0YW5kYWxvbmUgbW9kdWxlCi0g ICAgUVQgKz0gc2NyaXB0Ci19IGVsc2UgeworIWhhdmVRdCg1KSB7CiAgICAgSU5DTFVERVBBVEgg Kz0gJCRQV0QvLi4vV1RGL3d0Zi9xdC9jb21wYXQKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlclF0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXJRdC5jcHAKaW5kZXggOTc5YTRmNjU4ZGVjOTk3 ZmE5MTk4NWE5ZTkzODhiMmFkNGFkMmU3Zi4uMTRlODk0MjU2MDZiYTYxOTc4ZTI1YjlhZTVmNzY3 ZjhkOTYyZjFlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0 Q29udHJvbGxlclF0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRD b250cm9sbGVyUXQuY3BwCkBAIC01OSw3ICs1OSw3IEBAIFBhc3NSZWZQdHI8SlNDOjpCaW5kaW5n czo6SW5zdGFuY2U+IFNjcmlwdENvbnRyb2xsZXI6OmNyZWF0ZVNjcmlwdEluc3RhbmNlRm9yV2lk CiAgICAgaWYgKCFvYmplY3QpCiAgICAgICAgIHJldHVybiAwOwogCi0gICAgcmV0dXJuIEpTQzo6 QmluZGluZ3M6OlF0SW5zdGFuY2U6OmdldFF0SW5zdGFuY2Uob2JqZWN0LCBiaW5kaW5nUm9vdE9i amVjdCgpLCBRU2NyaXB0RW5naW5lOjpRdE93bmVyc2hpcCk7CisgICAgcmV0dXJuIEpTQzo6Qmlu ZGluZ3M6OlF0SW5zdGFuY2U6OmdldFF0SW5zdGFuY2Uob2JqZWN0LCBiaW5kaW5nUm9vdE9iamVj dCgpLCBKU0M6OkJpbmRpbmdzOjpRdEluc3RhbmNlOjpRdE93bmVyc2hpcCk7CiB9CiAKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwCmluZGV4IDljZjhkNWViMDQ1ZmIy ZjNjZWEwMzM4N2U4ZjU1YzBmMWI3MTdiNGYuLmUxZmVkYzhiMmE0NjAwMWJkOGUyZjYwMzU4OTk2 MWZlMTY2MTc0YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0 YW5jZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcApA QCAtODEsNyArODEsNyBAQCBRdFJ1bnRpbWVPYmplY3Q6OlF0UnVudGltZU9iamVjdChFeGVjU3Rh dGUqIGV4ZWMsIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsCiB9CiAKIC8vIFF0SW5zdGFu Y2UKLVF0SW5zdGFuY2U6OlF0SW5zdGFuY2UoUU9iamVjdCogbywgUGFzc1JlZlB0cjxSb290T2Jq ZWN0PiByb290T2JqZWN0LCBRU2NyaXB0RW5naW5lOjpWYWx1ZU93bmVyc2hpcCBvd25lcnNoaXAp CitRdEluc3RhbmNlOjpRdEluc3RhbmNlKFFPYmplY3QqIG8sIFBhc3NSZWZQdHI8Um9vdE9iamVj dD4gcm9vdE9iamVjdCwgVmFsdWVPd25lcnNoaXAgb3duZXJzaGlwKQogICAgIDogSW5zdGFuY2Uo cm9vdE9iamVjdCkKICAgICAsIG1fY2xhc3MoMCkKICAgICAsIG1fb2JqZWN0KG8pCkBAIC0xMDQs MjAgKzEwNCwyMCBAQCBRdEluc3RhbmNlOjp+UXRJbnN0YW5jZSgpCiAKICAgICBpZiAobV9vYmpl Y3QpIHsKICAgICAgICAgc3dpdGNoIChtX293bmVyc2hpcCkgewotICAgICAgICBjYXNlIFFTY3Jp cHRFbmdpbmU6OlF0T3duZXJzaGlwOgorICAgICAgICBjYXNlIFF0T3duZXJzaGlwOgogICAgICAg ICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgUVNjcmlwdEVuZ2luZTo6QXV0b093bmVyc2hpcDoK KyAgICAgICAgY2FzZSBBdXRvT3duZXJzaGlwOgogICAgICAgICAgICAgaWYgKG1fb2JqZWN0LmRh dGEoKS0+cGFyZW50KCkpCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAvLyBm YWxsIHRocm91Z2ghCi0gICAgICAgIGNhc2UgUVNjcmlwdEVuZ2luZTo6U2NyaXB0T3duZXJzaGlw OgorICAgICAgICBjYXNlIFNjcmlwdE93bmVyc2hpcDoKICAgICAgICAgICAgIGRlbGV0ZSBtX29i amVjdC5kYXRhKCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgIH0KIH0KIAot UGFzc1JlZlB0cjxRdEluc3RhbmNlPiBRdEluc3RhbmNlOjpnZXRRdEluc3RhbmNlKFFPYmplY3Qq IG8sIFBhc3NSZWZQdHI8Um9vdE9iamVjdD4gcm9vdE9iamVjdCwgUVNjcmlwdEVuZ2luZTo6VmFs dWVPd25lcnNoaXAgb3duZXJzaGlwKQorUGFzc1JlZlB0cjxRdEluc3RhbmNlPiBRdEluc3RhbmNl OjpnZXRRdEluc3RhbmNlKFFPYmplY3QqIG8sIFBhc3NSZWZQdHI8Um9vdE9iamVjdD4gcm9vdE9i amVjdCwgVmFsdWVPd25lcnNoaXAgb3duZXJzaGlwKQogewogICAgIEpTTG9jayBsb2NrKFNpbGVu Y2VBc3NlcnRpb25zT25seSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9x dC9xdF9pbnN0YW5jZS5oIGIvU291cmNlL1dlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmgK aW5kZXggYjAyMjc5MjA2ZDhiY2ZiOWI2MzlmNzcwNDMzNDBjODJhNWNmM2NhMy4uMzYwYzRhYTQy YzMxODhlNTBiNmNkM2U5MWNlMzBkNGUyOWEyMGI4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYnJpZGdlL3F0 L3F0X2luc3RhbmNlLmgKQEAgLTIzLDcgKzIzLDYgQEAKICNpbmNsdWRlICJCcmlkZ2VKU0MuaCIK ICNpbmNsdWRlIDxRU3RhY2s+CiAjaW5jbHVkZSA8UVdlYWtQb2ludGVyPgotI2luY2x1ZGUgPFF0 U2NyaXB0L3FzY3JpcHRlbmdpbmUuaD4KICNpbmNsdWRlICJXZWFrLmgiCiAjaW5jbHVkZSAicnVu dGltZV9yb290LmgiCiAjaW5jbHVkZSA8cWhhc2guaD4KQEAgLTM5LDYgKzM4LDEyIEBAIGNsYXNz IFF0UnVudGltZU1ldGFNZXRob2Q7CiAKIGNsYXNzIFF0SW5zdGFuY2UgOiBwdWJsaWMgSW5zdGFu Y2UgewogcHVibGljOgorICAgIGVudW0gVmFsdWVPd25lcnNoaXAgeworICAgICAgICBRdE93bmVy c2hpcCwKKyAgICAgICAgU2NyaXB0T3duZXJzaGlwLAorICAgICAgICBBdXRvT3duZXJzaGlwCisg ICAgfTsKKwogICAgIH5RdEluc3RhbmNlKCk7CiAKICAgICB2aXJ0dWFsIENsYXNzKiBnZXRDbGFz cygpIGNvbnN0OwpAQCAtNjIsNyArNjcsNyBAQCBwdWJsaWM6CiAgICAgUU9iamVjdCogZ2V0T2Jq ZWN0KCkgY29uc3QgeyByZXR1cm4gbV9vYmplY3QuZGF0YSgpOyB9CiAgICAgUU9iamVjdCogaGFz aEtleSgpIGNvbnN0IHsgcmV0dXJuIG1faGFzaGtleTsgfQogCi0gICAgc3RhdGljIFBhc3NSZWZQ dHI8UXRJbnN0YW5jZT4gZ2V0UXRJbnN0YW5jZShRT2JqZWN0KiwgUGFzc1JlZlB0cjxSb290T2Jq ZWN0PiwgUVNjcmlwdEVuZ2luZTo6VmFsdWVPd25lcnNoaXAgb3duZXJzaGlwKTsKKyAgICBzdGF0 aWMgUGFzc1JlZlB0cjxRdEluc3RhbmNlPiBnZXRRdEluc3RhbmNlKFFPYmplY3QqLCBQYXNzUmVm UHRyPFJvb3RPYmplY3Q+LCBWYWx1ZU93bmVyc2hpcCk7CiAKICAgICB2aXJ0dWFsIGJvb2wgZ2V0 T3duUHJvcGVydHlTbG90KEpTT2JqZWN0KiwgRXhlY1N0YXRlKiwgUHJvcGVydHlOYW1lLCBQcm9w ZXJ0eVNsb3QmKTsKICAgICB2aXJ0dWFsIHZvaWQgcHV0KEpTT2JqZWN0KiwgRXhlY1N0YXRlKiwg UHJvcGVydHlOYW1lLCBKU1ZhbHVlLCBQdXRQcm9wZXJ0eVNsb3QmKTsKQEAgLTExNywyMCArMTIy LDIwIEBAIHByaXZhdGU6CiAgICAgICAgIFdlYWs8SlNPYmplY3Q+IG1fcmVmZXJlbmNlOwogICAg IH07CiAKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxRdEluc3RhbmNlPiBjcmVhdGUoUU9iamVjdCAq aW5zdGFuY2UsIFBhc3NSZWZQdHI8Um9vdE9iamVjdD4gcm9vdE9iamVjdCwgUVNjcmlwdEVuZ2lu ZTo6VmFsdWVPd25lcnNoaXAgb3duZXJzaGlwKQorICAgIHN0YXRpYyBQYXNzUmVmUHRyPFF0SW5z dGFuY2U+IGNyZWF0ZShRT2JqZWN0ICppbnN0YW5jZSwgUGFzc1JlZlB0cjxSb290T2JqZWN0PiBy b290T2JqZWN0LCBWYWx1ZU93bmVyc2hpcCBvd25lcnNoaXApCiAgICAgewogICAgICAgICByZXR1 cm4gYWRvcHRSZWYobmV3IFF0SW5zdGFuY2UoaW5zdGFuY2UsIHJvb3RPYmplY3QsIG93bmVyc2hp cCkpOwogICAgIH0KIAogICAgIGZyaWVuZCBjbGFzcyBRdENsYXNzOwogICAgIGZyaWVuZCBjbGFz cyBRdEZpZWxkOwotICAgIFF0SW5zdGFuY2UoUU9iamVjdCosIFBhc3NSZWZQdHI8Um9vdE9iamVj dD4sIFFTY3JpcHRFbmdpbmU6OlZhbHVlT3duZXJzaGlwIG93bmVyc2hpcCk7IC8vIEZhY3Rvcnkg cHJvZHVjZWQgb25seS4uCisgICAgUXRJbnN0YW5jZShRT2JqZWN0KiwgUGFzc1JlZlB0cjxSb290 T2JqZWN0PiwgVmFsdWVPd25lcnNoaXApOyAvLyBGYWN0b3J5IHByb2R1Y2VkIG9ubHkuLgogICAg IG11dGFibGUgUXRDbGFzcyogbV9jbGFzczsKICAgICBRV2Vha1BvaW50ZXI8UU9iamVjdD4gbV9v YmplY3Q7CiAgICAgUU9iamVjdCogbV9oYXNoa2V5OwogICAgIG11dGFibGUgUUhhc2g8UUJ5dGVB cnJheSwgUXRXZWFrT2JqZWN0UmVmZXJlbmNlPiBtX21ldGhvZHM7CiAgICAgbXV0YWJsZSBRSGFz aDxRU3RyaW5nLCBRdEZpZWxkKj4gbV9maWVsZHM7Ci0gICAgUVNjcmlwdEVuZ2luZTo6VmFsdWVP d25lcnNoaXAgbV9vd25lcnNoaXA7CisgICAgVmFsdWVPd25lcnNoaXAgbV9vd25lcnNoaXA7CiB9 OwogCiB9IC8vIG5hbWVzcGFjZSBCaW5kaW5ncwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YnJpZGdlL3F0L3F0X3J1bnRpbWUuY3BwIGIvU291cmNlL1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1 bnRpbWUuY3BwCmluZGV4IDA0YTkzMDVhY2Y5ZjdjNzgyZDUzZWMwOGQ1NDIwYTU1Yjk4NDhjYjYu Ljg3ODk1OTczYTE2Njk4ODk2ODJmZWJhODQyNDIxYjZlMmNiOWIyZjcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9ydW50aW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9icmlkZ2UvcXQvcXRfcnVudGltZS5jcHAKQEAgLTg5Niw3ICs4OTYsNyBAQCBKU1ZhbHVlIGNv bnZlcnRRVmFyaWFudFRvVmFsdWUoRXhlY1N0YXRlKiBleGVjLCBQYXNzUmVmUHRyPFJvb3RPYmpl Y3Q+IHJvb3QsIGNvbgogICAgICAgICBRT2JqZWN0KiBvYmogPSB2YXJpYW50LnZhbHVlPFFPYmpl Y3QqPigpOwogICAgICAgICBpZiAoIW9iaikKICAgICAgICAgICAgIHJldHVybiBqc051bGwoKTsK LSAgICAgICAgcmV0dXJuIFF0SW5zdGFuY2U6OmdldFF0SW5zdGFuY2Uob2JqLCByb290LCBRU2Ny aXB0RW5naW5lOjpRdE93bmVyc2hpcCktPmNyZWF0ZVJ1bnRpbWVPYmplY3QoZXhlYyk7CisgICAg ICAgIHJldHVybiBRdEluc3RhbmNlOjpnZXRRdEluc3RhbmNlKG9iaiwgcm9vdCwgUXRJbnN0YW5j ZTo6UXRPd25lcnNoaXApLT5jcmVhdGVSdW50aW1lT2JqZWN0KGV4ZWMpOwogICAgIH0KIAogICAg IGlmIChRdFBpeG1hcEluc3RhbmNlOjpjYW5IYW5kbGUoc3RhdGljX2Nhc3Q8UU1ldGFUeXBlOjpU eXBlPih2YXJpYW50LnR5cGUoKSkpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYnJpZGdl L3F0L3F0X3J1bnRpbWVfcXQ0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9ydW50 aW1lX3F0NC5jcHAKaW5kZXggMjc2ZmJmMDMyOTM4MzVjYzE0MjIwYzA1ZWFmYjAxM2MwMTBkYTYy OC4uNDEzYzZhMGEzNzZkZTBlYzA4OTBhOWY2MWFhODZhZmEyMmEwYjAwNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWVfcXQ0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9icmlkZ2UvcXQvcXRfcnVudGltZV9xdDQuY3BwCkBAIC04OTYsNyArODk2LDcgQEAg SlNWYWx1ZSBjb252ZXJ0UVZhcmlhbnRUb1ZhbHVlKEV4ZWNTdGF0ZSogZXhlYywgUGFzc1JlZlB0 cjxSb290T2JqZWN0PiByb290LCBjb24KICAgICAgICAgUU9iamVjdCogb2JqID0gdmFyaWFudC52 YWx1ZTxRT2JqZWN0Kj4oKTsKICAgICAgICAgaWYgKCFvYmopCiAgICAgICAgICAgICByZXR1cm4g anNOdWxsKCk7Ci0gICAgICAgIHJldHVybiBRdEluc3RhbmNlOjpnZXRRdEluc3RhbmNlKG9iaiwg cm9vdCwgUVNjcmlwdEVuZ2luZTo6UXRPd25lcnNoaXApLT5jcmVhdGVSdW50aW1lT2JqZWN0KGV4 ZWMpOworICAgICAgICByZXR1cm4gUXRJbnN0YW5jZTo6Z2V0UXRJbnN0YW5jZShvYmosIHJvb3Qs IFF0SW5zdGFuY2U6OlF0T3duZXJzaGlwKS0+Y3JlYXRlUnVudGltZU9iamVjdChleGVjKTsKICAg ICB9CiAKICAgICBpZiAoUXRQaXhtYXBJbnN0YW5jZTo6Y2FuSGFuZGxlKHN0YXRpY19jYXN0PFFN ZXRhVHlwZTo6VHlwZT4odmFyaWFudC50eXBlKCkpKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUu Y3BwCmluZGV4IDQzOWU4ZWQxMmExMWRmN2UyMmQ1OWZjYmRlMGZmMDJkM2JkOTVhNjYuLmI3MmQ0 ZTQ3YWQ3ODBlOGQ2NjRjMDk4ZjFmMzg2ODc5NGFjZTc5NzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdl YmZyYW1lLmNwcApAQCAtNTAwLDcgKzUwMCw3IEBAIHN0YXRpYyBKU1ZhbHVlUmVmIHF0U2VuZGVy Q2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRleHQsIEpTT2JqZWN0UmVmLCBKU09iamVjdFJlCiAK ICAgICBKU0M6OkV4ZWNTdGF0ZSogZXhlYyA9IDo6dG9KUyhjb250ZXh0KTsKICAgICBSZWZQdHI8 SlNDOjpCaW5kaW5nczo6Um9vdE9iamVjdD4gcm9vdE9iamVjdCA9IEpTQzo6QmluZGluZ3M6OmZp bmRSb290T2JqZWN0KGV4ZWMtPmR5bmFtaWNHbG9iYWxPYmplY3QoKSk7Ci0gICAgSlNDOjpKU09i amVjdCoganNTZW5kZXIgPSBKU0M6OkJpbmRpbmdzOjpRdEluc3RhbmNlOjpnZXRRdEluc3RhbmNl KHNlbmRlciwgcm9vdE9iamVjdCwgUVNjcmlwdEVuZ2luZTo6UXRPd25lcnNoaXApLT5jcmVhdGVS dW50aW1lT2JqZWN0KGV4ZWMpOworICAgIEpTQzo6SlNPYmplY3QqIGpzU2VuZGVyID0gSlNDOjpC aW5kaW5nczo6UXRJbnN0YW5jZTo6Z2V0UXRJbnN0YW5jZShzZW5kZXIsIHJvb3RPYmplY3QsIEpT Qzo6QmluZGluZ3M6OlF0SW5zdGFuY2U6OlF0T3duZXJzaGlwKS0+Y3JlYXRlUnVudGltZU9iamVj dChleGVjKTsKICAgICByZXR1cm4gOjp0b1JlZihqc1NlbmRlcik7CiB9CiAKQEAgLTYyOSwzMCAr NjI5LDcgQEAgUVdlYkZyYW1lOjp+UVdlYkZyYW1lKCkKIH0KIAogLyohCi0gICAgTWFrZSBcYSBv YmplY3QgYXZhaWxhYmxlIHVuZGVyIFxhIG5hbWUgZnJvbSB3aXRoaW4gdGhlIGZyYW1lJ3MgSmF2 YVNjcmlwdAotICAgIGNvbnRleHQuIFRoZSBcYSBvYmplY3Qgd2lsbCBiZSBpbnNlcnRlZCBhcyBh IGNoaWxkIG9mIHRoZSBmcmFtZSdzIHdpbmRvdwotICAgIG9iamVjdC4KLQotICAgIFF0IHByb3Bl cnRpZXMgd2lsbCBiZSBleHBvc2VkIGFzIEphdmFTY3JpcHQgcHJvcGVydGllcyBhbmQgc2xvdHMg YXMKLSAgICBKYXZhU2NyaXB0IG1ldGhvZHMuCi0gICAgVGhlIGludGVyYWN0aW9uIGJldHdlZW4g QysrIGFuZCBKYXZhU2NyaXB0IGlzIGV4cGxhaW5lZCBpbiB0aGUgZG9jdW1lbnRhdGlvbiBvZiB0 aGUgXGx7VGhlIFF0V2ViS2l0IEJyaWRnZX17UXRXZWJLaXQgYnJpZGdlfS4KLQotICAgIElmIHlv dSB3YW50IHRvIGVuc3VyZSB0aGF0IHlvdXIgUU9iamVjdHMgcmVtYWluIGFjY2Vzc2libGUgYWZ0 ZXIgbG9hZGluZyBhCi0gICAgbmV3IFVSTCwgeW91IHNob3VsZCBhZGQgdGhlbSBpbiBhIHNsb3Qg Y29ubmVjdGVkIHRvIHRoZQotICAgIGphdmFTY3JpcHRXaW5kb3dPYmplY3RDbGVhcmVkKCkgc2ln bmFsLgotCi0gICAgSWYgSmF2YXNjcmlwdCBpcyBub3QgZW5hYmxlZCBmb3IgdGhpcyBwYWdlLCB0 aGVuIHRoaXMgbWV0aG9kIGRvZXMgbm90aGluZy4KLQotICAgIFRoZSBcYSBvYmplY3Qgd2lsbCBu ZXZlciBiZSBleHBsaWNpdGx5IGRlbGV0ZWQgYnkgUXRXZWJLaXQuCi0qLwotdm9pZCBRV2ViRnJh bWU6OmFkZFRvSmF2YVNjcmlwdFdpbmRvd09iamVjdChjb25zdCBRU3RyaW5nICZuYW1lLCBRT2Jq ZWN0ICpvYmplY3QpCi17Ci0gICAgYWRkVG9KYXZhU2NyaXB0V2luZG93T2JqZWN0KG5hbWUsIG9i amVjdCwgUVNjcmlwdEVuZ2luZTo6UXRPd25lcnNoaXApOwotfQotCi0vKiEKLSAgICBcZm4gdm9p ZCBRV2ViRnJhbWU6OmFkZFRvSmF2YVNjcmlwdFdpbmRvd09iamVjdChjb25zdCBRU3RyaW5nICZu YW1lLCBRT2JqZWN0ICpvYmplY3QsIFFTY3JpcHRFbmdpbmU6OlZhbHVlT3duZXJzaGlwIG93bikK LSAgICBcb3ZlcmxvYWQKKyAgICBcZm4gdm9pZCBRV2ViRnJhbWU6OmFkZFRvSmF2YVNjcmlwdFdp bmRvd09iamVjdChjb25zdCBRU3RyaW5nICZuYW1lLCBRT2JqZWN0ICpvYmplY3QsIFZhbHVlT3du ZXJzaGlwIG93bikKIAogICAgIE1ha2UgXGEgb2JqZWN0IGF2YWlsYWJsZSB1bmRlciBcYSBuYW1l IGZyb20gd2l0aGluIHRoZSBmcmFtZSdzIEphdmFTY3JpcHQKICAgICBjb250ZXh0LiBUaGUgXGEg b2JqZWN0IHdpbGwgYmUgaW5zZXJ0ZWQgYXMgYSBjaGlsZCBvZiB0aGUgZnJhbWUncyB3aW5kb3cK QEAgLTY3MCwxNSArNjQ3LDIwIEBAIHZvaWQgUVdlYkZyYW1lOjphZGRUb0phdmFTY3JpcHRXaW5k b3dPYmplY3QoY29uc3QgUVN0cmluZyAmbmFtZSwgUU9iamVjdCAqb2JqZWN0CiAKICAgICBUaGUg b3duZXJzaGlwIG9mIFxhIG9iamVjdCBpcyBzcGVjaWZpZWQgdXNpbmcgXGEgb3duLgogKi8KKyNp ZiBRVF9WRVJTSU9OID49IFFUX1ZFUlNJT05fQ0hFQ0soNSwgMCwgMCkKK3ZvaWQgUVdlYkZyYW1l OjphZGRUb0phdmFTY3JpcHRXaW5kb3dPYmplY3QoY29uc3QgUVN0cmluZyAmbmFtZSwgUU9iamVj dCAqb2JqZWN0LCBWYWx1ZU93bmVyc2hpcCBvd25lcnNoaXApCisjZWxzZQogdm9pZCBRV2ViRnJh bWU6OmFkZFRvSmF2YVNjcmlwdFdpbmRvd09iamVjdChjb25zdCBRU3RyaW5nICZuYW1lLCBRT2Jq ZWN0ICpvYmplY3QsIFFTY3JpcHRFbmdpbmU6OlZhbHVlT3duZXJzaGlwIG93bmVyc2hpcCkKKyNl bmRpZgogewogICAgIGlmICghcGFnZSgpLT5zZXR0aW5ncygpLT50ZXN0QXR0cmlidXRlKFFXZWJT ZXR0aW5nczo6SmF2YXNjcmlwdEVuYWJsZWQpKQogICAgICAgICByZXR1cm47CiAjaWYgVVNFKEpT QykKKyAgICBKU0M6OkJpbmRpbmdzOjpRdEluc3RhbmNlOjpWYWx1ZU93bmVyc2hpcCB2YWx1ZU93 bmVyc2hpcCA9IHN0YXRpY19jYXN0PEpTQzo6QmluZGluZ3M6OlF0SW5zdGFuY2U6OlZhbHVlT3du ZXJzaGlwPihvd25lcnNoaXApOwogICAgIEpTQzo6SlNMb2NrIGxvY2soSlNDOjpTaWxlbmNlQXNz ZXJ0aW9uc09ubHkpOwogICAgIEpTRE9NV2luZG93KiB3aW5kb3cgPSB0b0pTRE9NV2luZG93KGQt PmZyYW1lLCBtYWluVGhyZWFkTm9ybWFsV29ybGQoKSk7CiAgICAgSlNDOjpCaW5kaW5nczo6Um9v dE9iamVjdCogcm9vdDsKLSAgICBpZiAob3duZXJzaGlwID09IFFTY3JpcHRFbmdpbmU6OlF0T3du ZXJzaGlwKQorICAgIGlmICh2YWx1ZU93bmVyc2hpcCA9PSBKU0M6OkJpbmRpbmdzOjpRdEluc3Rh bmNlOjpRdE93bmVyc2hpcCkKICAgICAgICAgcm9vdCA9IGQtPmZyYW1lLT5zY3JpcHQoKS0+Y2Fj aGVhYmxlQmluZGluZ1Jvb3RPYmplY3QoKTsKICAgICBlbHNlCiAgICAgICAgIHJvb3QgPSBkLT5m cmFtZS0+c2NyaXB0KCktPmJpbmRpbmdSb290T2JqZWN0KCk7CkBAIC02OTUsNyArNjc3LDcgQEAg dm9pZCBRV2ViRnJhbWU6OmFkZFRvSmF2YVNjcmlwdFdpbmRvd09iamVjdChjb25zdCBRU3RyaW5n ICZuYW1lLCBRT2JqZWN0ICpvYmplY3QKICAgICBKU0M6OkV4ZWNTdGF0ZSogZXhlYyA9IHdpbmRv dy0+Z2xvYmFsRXhlYygpOwogCiAgICAgSlNDOjpKU09iamVjdCogcnVudGltZU9iamVjdCA9Ci0g ICAgICAgICAgICBKU0M6OkJpbmRpbmdzOjpRdEluc3RhbmNlOjpnZXRRdEluc3RhbmNlKG9iamVj dCwgcm9vdCwgb3duZXJzaGlwKS0+Y3JlYXRlUnVudGltZU9iamVjdChleGVjKTsKKyAgICAgICAg ICAgIEpTQzo6QmluZGluZ3M6OlF0SW5zdGFuY2U6OmdldFF0SW5zdGFuY2Uob2JqZWN0LCByb290 LCB2YWx1ZU93bmVyc2hpcCktPmNyZWF0ZVJ1bnRpbWVPYmplY3QoZXhlYyk7CiAKICAgICBKU0M6 OlB1dFByb3BlcnR5U2xvdCBzbG90OwogICAgIHdpbmRvdy0+bWV0aG9kVGFibGUoKS0+cHV0KHdp bmRvdywgZXhlYywgSlNDOjpJZGVudGlmaWVyKCZleGVjLT5nbG9iYWxEYXRhKCksIHJlaW50ZXJw cmV0X2Nhc3RfcHRyPGNvbnN0IFVDaGFyKj4obmFtZS5jb25zdERhdGEoKSksIG5hbWUubGVuZ3Ro KCkpLCBydW50aW1lT2JqZWN0LCBzbG90KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQv QXBpL3F3ZWJmcmFtZS5oIGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmgKaW5kZXgg MGE4ZTZmYzY1ZmU2NjA5OWIyMWI2YzI1OGIzMmJiOWVkZWI4NDZjNi4uNmQ0ODZkNTBlY2FiNjhk ZDcwODllMTJkMmExODMzYzI3YmUxZTgzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9B cGkvcXdlYmZyYW1lLmgKKysrIGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmgKQEAg LTI1LDEwICsyNSwxMyBAQAogI2luY2x1ZGUgPFF0Q29yZS9xdXJsLmg+CiAjaW5jbHVkZSA8UXRD b3JlL3F2YXJpYW50Lmg+CiAjaW5jbHVkZSA8UXRHdWkvcWljb24uaD4KLSNpbmNsdWRlIDxRdFNj cmlwdC9xc2NyaXB0ZW5naW5lLmg+CiAjaW5jbHVkZSA8UXROZXR3b3JrL3FuZXR3b3JrYWNjZXNz bWFuYWdlci5oPgogI2luY2x1ZGUgInF3ZWJraXRnbG9iYWwuaCIKIAorI2lmIFFUX1ZFUlNJT04g PCBRVF9WRVJTSU9OX0NIRUNLKDUsIDAsIDApCisjaW5jbHVkZSA8UXRTY3JpcHQvcXNjcmlwdGVu Z2luZS5oPgorI2VuZGlmCisKIFFUX0JFR0lOX05BTUVTUEFDRQogY2xhc3MgUVJlY3Q7CiBjbGFz cyBRUG9pbnQ7CkBAIC0xMjEsNiArMTI0LDE0IEBAIHByaXZhdGU6CiAgICAgflFXZWJGcmFtZSgp OwogCiBwdWJsaWM6CisjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDUsIDAsIDAp CisgICAgZW51bSBWYWx1ZU93bmVyc2hpcCB7CisgICAgICAgIFF0T3duZXJzaGlwLAorICAgICAg ICBTY3JpcHRPd25lcnNoaXAsCisgICAgICAgIEF1dG9Pd25lcnNoaXAKKyAgICB9OworI2VuZGlm CisKICAgICBRV2ViUGFnZSAqcGFnZSgpIGNvbnN0OwogCiAgICAgdm9pZCBsb2FkKGNvbnN0IFFV cmwgJnVybCk7CkBAIC0xMjgsOCArMTM5LDExIEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEh0bWwo Y29uc3QgUVN0cmluZyAmaHRtbCwgY29uc3QgUVVybCAmYmFzZVVybCA9IFFVcmwoKSk7CiAgICAg dm9pZCBzZXRDb250ZW50KGNvbnN0IFFCeXRlQXJyYXkgJmRhdGEsIGNvbnN0IFFTdHJpbmcgJm1p bWVUeXBlID0gUVN0cmluZygpLCBjb25zdCBRVXJsICZiYXNlVXJsID0gUVVybCgpKTsKIAotICAg IHZvaWQgYWRkVG9KYXZhU2NyaXB0V2luZG93T2JqZWN0KGNvbnN0IFFTdHJpbmcgJm5hbWUsIFFP YmplY3QgKm9iamVjdCk7Ci0gICAgdm9pZCBhZGRUb0phdmFTY3JpcHRXaW5kb3dPYmplY3QoY29u c3QgUVN0cmluZyAmbmFtZSwgUU9iamVjdCAqb2JqZWN0LCBRU2NyaXB0RW5naW5lOjpWYWx1ZU93 bmVyc2hpcCBvd25lcnNoaXApOworI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg1 LCAwLCAwKQorICAgIHZvaWQgYWRkVG9KYXZhU2NyaXB0V2luZG93T2JqZWN0KGNvbnN0IFFTdHJp bmcgJm5hbWUsIFFPYmplY3QgKm9iamVjdCwgVmFsdWVPd25lcnNoaXAgb3duZXJzaGlwID0gUXRP d25lcnNoaXApOworI2Vsc2UKKyAgICB2b2lkIGFkZFRvSmF2YVNjcmlwdFdpbmRvd09iamVjdChj b25zdCBRU3RyaW5nICZuYW1lLCBRT2JqZWN0ICpvYmplY3QsIFFTY3JpcHRFbmdpbmU6OlZhbHVl T3duZXJzaGlwIG93bmVyc2hpcCA9IFFTY3JpcHRFbmdpbmU6OlF0T3duZXJzaGlwKTsKKyNlbmRp ZgogICAgIFFTdHJpbmcgdG9IdG1sKCkgY29uc3Q7CiAgICAgUVN0cmluZyB0b1BsYWluVGV4dCgp IGNvbnN0OwogICAgIFFTdHJpbmcgcmVuZGVyVHJlZUR1bXAoKSBjb25zdDsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcW9iamVjdGJyaWRnZS90c3RfcW9iamVjdGJyaWRnZS5j cHAgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FvYmplY3RicmlkZ2UvdHN0X3FvYmplY3Ricmlk Z2UuY3BwCmluZGV4IDU3MmViNDFkOGFmODg3MmRkOGEwYjFmY2FlNDYwMWIwYTljNjgxMDMuLjI5 MWY5YjI5NGM0OTgwY2U3YWQ2ZGNiZGRlZDNkZWUxZDVhNTdjNzcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvcXQvdGVzdHMvcW9iamVjdGJyaWRnZS90c3RfcW9iamVjdGJyaWRnZS5jcHAKKysr IGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xb2JqZWN0YnJpZGdlL3RzdF9xb2JqZWN0YnJpZGdl LmNwcApAQCAtMzcsNiArMzcsMTIgQEAgUV9ERUNMQVJFX01FVEFUWVBFKFF0OjpCcnVzaFN0eWxl KQogUV9ERUNMQVJFX01FVEFUWVBFKFFWYXJpYW50TGlzdCkKIFFfREVDTEFSRV9NRVRBVFlQRShR VmFyaWFudE1hcCkKIAorI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg1LCAwLCAw KQorI2RlZmluZSBPd25lcnNoaXBDbGFzcyBRV2ViRnJhbWUKKyNlbHNlCisjZGVmaW5lIE93bmVy c2hpcENsYXNzIFFTY3JpcHRFbmdpbmUKKyNlbmRpZgorCiBjbGFzcyBNeVFPYmplY3QgOiBwdWJs aWMgUU9iamVjdCB7CiAgICAgUV9PQkpFQ1QKIApAQCAtMTk5NCw3ICsyMDAwLDcgQEAgdm9pZCB0 c3RfUU9iamVjdEJyaWRnZTo6YXJyYXlPYmplY3RFbnVtZXJhYmxlKCkKICAgICBRV2ViUGFnZSBw YWdlOwogICAgIFFXZWJGcmFtZSogZnJhbWUgPSBwYWdlLm1haW5GcmFtZSgpOwogICAgIFFPYmpl Y3QqIHFvYmplY3QgPSBuZXcgU3RyaW5nTGlzdFRlc3RPYmplY3QoKTsKLSAgICBmcmFtZS0+YWRk VG9KYXZhU2NyaXB0V2luZG93T2JqZWN0KCJ0ZXN0IiwgcW9iamVjdCwgUVNjcmlwdEVuZ2luZTo6 U2NyaXB0T3duZXJzaGlwKTsKKyAgICBmcmFtZS0+YWRkVG9KYXZhU2NyaXB0V2luZG93T2JqZWN0 KCJ0ZXN0IiwgcW9iamVjdCwgT3duZXJzaGlwQ2xhc3M6OlNjcmlwdE93bmVyc2hpcCk7CiAKICAg ICBjb25zdCBRU3RyaW5nIHNjcmlwdCgidmFyIHN0cmluZ0FycmF5ID0gdGVzdC5zdHJpbmdMaXN0 KCk7IgogICAgICAgICAgICAgICAgICAgICAgICAgICJ2YXIgcmVzdWx0ID0gJyc7IgpAQCAtMjAz NSw3ICsyMDQxLDcgQEAgdm9pZCB0c3RfUU9iamVjdEJyaWRnZTo6b3duZXJzaGlwKCkKICAgICAg ICAgewogICAgICAgICAgICAgUVdlYlBhZ2UgcGFnZTsKICAgICAgICAgICAgIFFXZWJGcmFtZSog ZnJhbWUgPSBwYWdlLm1haW5GcmFtZSgpOwotICAgICAgICAgICAgZnJhbWUtPmFkZFRvSmF2YVNj cmlwdFdpbmRvd09iamVjdCgidGVzdCIsIHB0ci5kYXRhKCksIFFTY3JpcHRFbmdpbmU6OlNjcmlw dE93bmVyc2hpcCk7CisgICAgICAgICAgICBmcmFtZS0+YWRkVG9KYXZhU2NyaXB0V2luZG93T2Jq ZWN0KCJ0ZXN0IiwgcHRyLmRhdGEoKSwgT3duZXJzaGlwQ2xhc3M6OlNjcmlwdE93bmVyc2hpcCk7 CiAgICAgICAgIH0KICAgICAgICAgUVZFUklGWSghcHRyKTsKICAgICB9CkBAIC0yMDQ2LDcgKzIw NTIsNyBAQCB2b2lkIHRzdF9RT2JqZWN0QnJpZGdlOjpvd25lcnNoaXAoKQogICAgICAgICB7CiAg ICAgICAgICAgICBRV2ViUGFnZSBwYWdlOwogICAgICAgICAgICAgUVdlYkZyYW1lKiBmcmFtZSA9 IHBhZ2UubWFpbkZyYW1lKCk7Ci0gICAgICAgICAgICBmcmFtZS0+YWRkVG9KYXZhU2NyaXB0V2lu ZG93T2JqZWN0KCJ0ZXN0IiwgcHRyLmRhdGEoKSwgUVNjcmlwdEVuZ2luZTo6UXRPd25lcnNoaXAp OworICAgICAgICAgICAgZnJhbWUtPmFkZFRvSmF2YVNjcmlwdFdpbmRvd09iamVjdCgidGVzdCIs IHB0ci5kYXRhKCksIE93bmVyc2hpcENsYXNzOjpRdE93bmVyc2hpcCk7CiAgICAgICAgIH0KICAg ICAgICAgUVZFUklGWShwdHIuZGF0YSgpID09IGJlZm9yZSk7CiAgICAgICAgIGRlbGV0ZSBwdHIu ZGF0YSgpOwpAQCAtMjA1Niw3ICsyMDYyLDcgQEAgdm9pZCB0c3RfUU9iamVjdEJyaWRnZTo6b3du ZXJzaGlwKCkKICAgICAgICAgUU9iamVjdCogY2hpbGQgPSBuZXcgUU9iamVjdChwYXJlbnQpOwog ICAgICAgICBRV2ViUGFnZSBwYWdlOwogICAgICAgICBRV2ViRnJhbWUqIGZyYW1lID0gcGFnZS5t YWluRnJhbWUoKTsKLSAgICAgICAgZnJhbWUtPmFkZFRvSmF2YVNjcmlwdFdpbmRvd09iamVjdCgi dGVzdCIsIGNoaWxkLCBRU2NyaXB0RW5naW5lOjpRdE93bmVyc2hpcCk7CisgICAgICAgIGZyYW1l LT5hZGRUb0phdmFTY3JpcHRXaW5kb3dPYmplY3QoInRlc3QiLCBjaGlsZCwgT3duZXJzaGlwQ2xh c3M6OlF0T3duZXJzaGlwKTsKICAgICAgICAgUVZhcmlhbnQgdiA9IGZyYW1lLT5ldmFsdWF0ZUph dmFTY3JpcHQoInRlc3QiKTsKICAgICAgICAgUUNPTVBBUkUocXZhcmlhbnRfY2FzdDxRT2JqZWN0 Kj4odiksIGNoaWxkKTsKICAgICAgICAgZGVsZXRlIHBhcmVudDsKQEAgLTIwNjksNyArMjA3NSw3 IEBAIHZvaWQgdHN0X1FPYmplY3RCcmlkZ2U6Om93bmVyc2hpcCgpCiAgICAgICAgIHsKICAgICAg ICAgICAgIFFXZWJQYWdlIHBhZ2U7CiAgICAgICAgICAgICBRV2ViRnJhbWUqIGZyYW1lID0gcGFn ZS5tYWluRnJhbWUoKTsKLSAgICAgICAgICAgIGZyYW1lLT5hZGRUb0phdmFTY3JpcHRXaW5kb3dP YmplY3QoInRlc3QiLCBwdHIuZGF0YSgpLCBRU2NyaXB0RW5naW5lOjpBdXRvT3duZXJzaGlwKTsK KyAgICAgICAgICAgIGZyYW1lLT5hZGRUb0phdmFTY3JpcHRXaW5kb3dPYmplY3QoInRlc3QiLCBw dHIuZGF0YSgpLCBPd25lcnNoaXBDbGFzczo6QXV0b093bmVyc2hpcCk7CiAgICAgICAgIH0KICAg ICAgICAgLy8gbm8gcGFyZW50LCBzbyBpdCBzaG91bGQgYmUgbGlrZSBTY3JpcHRPd25lcnNoaXAK ICAgICAgICAgUVZFUklGWSghcHRyKTsKQEAgLTIwODEsNyArMjA4Nyw3IEBAIHZvaWQgdHN0X1FP YmplY3RCcmlkZ2U6Om93bmVyc2hpcCgpCiAgICAgICAgIHsKICAgICAgICAgICAgIFFXZWJQYWdl IHBhZ2U7CiAgICAgICAgICAgICBRV2ViRnJhbWUqIGZyYW1lID0gcGFnZS5tYWluRnJhbWUoKTsK LSAgICAgICAgICAgIGZyYW1lLT5hZGRUb0phdmFTY3JpcHRXaW5kb3dPYmplY3QoInRlc3QiLCBj aGlsZC5kYXRhKCksIFFTY3JpcHRFbmdpbmU6OkF1dG9Pd25lcnNoaXApOworICAgICAgICAgICAg ZnJhbWUtPmFkZFRvSmF2YVNjcmlwdFdpbmRvd09iamVjdCgidGVzdCIsIGNoaWxkLmRhdGEoKSwg T3duZXJzaGlwQ2xhc3M6OkF1dG9Pd25lcnNoaXApOwogICAgICAgICB9CiAgICAgICAgIC8vIGhh cyBwYXJlbnQsIHNvIGl0IHNob3VsZCBiZSBsaWtlIFF0T3duZXJzaGlwCiAgICAgICAgIFFWRVJJ RlkoY2hpbGQpOwpAQCAtMjEyMyw3ICsyMTI5LDcgQEAgdm9pZCB0c3RfUU9iamVjdEJyaWRnZTo6 cU9iamVjdFdyYXBwZXJXaXRoU2FtZUlkZW50aXR5KCkKICAgICBRV2ViRnJhbWUqIG1haW5GcmFt ZSA9IG1fdmlldy0+cGFnZSgpLT5tYWluRnJhbWUoKTsKICAgICBRQ09NUEFSRShtYWluRnJhbWUt PnRvUGxhaW5UZXh0KCksIFFTdHJpbmcoInRlc3QiKSk7CiAKLSAgICBtYWluRnJhbWUtPmFkZFRv SmF2YVNjcmlwdFdpbmRvd09iamVjdCgidGVzdCIsIG5ldyBUZXN0RmFjdG9yeSwgUVNjcmlwdEVu Z2luZTo6U2NyaXB0T3duZXJzaGlwKTsKKyAgICBtYWluRnJhbWUtPmFkZFRvSmF2YVNjcmlwdFdp bmRvd09iamVjdCgidGVzdCIsIG5ldyBUZXN0RmFjdG9yeSwgT3duZXJzaGlwQ2xhc3M6OlNjcmlw dE93bmVyc2hpcCk7CiAKICAgICBtYWluRnJhbWUtPmV2YWx1YXRlSmF2YVNjcmlwdCgidHJpZ2dl ckJ1ZygpOyIpOwogICAgIFFDT01QQVJFKG1haW5GcmFtZS0+dG9QbGFpblRleHQoKSwgUVN0cmlu ZygidGVzdDEiKSk7Cg==