46566 2010-09-25 05:43:29 -0700 [Qt] Add QWebFrame::addToJavaScriptWindowProperty() 2014-02-03 03:16:46 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC OS X 10.5 RESOLVED INVALID Qt, QtTriaged P2 Normal --- 41801 1 robert webkit-unassigned benjamin daniel.nystrom hausmann kling oldest_to_newest 284992 0 robert 2010-09-25 05:43:29 -0700 Add or override properties in the DOM Window object. This is necessary for clients that want to control the values returned by window.innerHeight, window.name and so on. Clients will want to do this to defeat some of the attacks outlined in https://bugs.webkit.org/show_bug.cgi?id=41801. 284993 1 68823 robert 2010-09-25 05:47:51 -0700 Created attachment 68823 Patch 285113 2 robert 2010-09-26 07:37:27 -0700 It would be even nicer if we could 'put' a function or method rather than a value in the window property. However I can't see how this would be possible. So if anyone has suggestions please weigh in! 286758 3 hausmann 2010-09-29 00:09:49 -0700 Hmm, why not simply overload addToJavascriptWindowObject? :) The Object suffix in them method name refers to the window object, not to adding an object to the window. 286760 4 hausmann 2010-09-29 00:11:57 -0700 In the medium term a move to V8 would make all this obsolete though, because then we can have QScriptEngine* QWebFrame::scriptEngine() and you can do everything you could ever imagine (with JavaScript :) 286996 5 69222 robert 2010-09-29 11:04:38 -0700 Created attachment 69222 Patch 287008 6 robert 2010-09-29 11:18:23 -0700 (In reply to comment #4) > In the medium term a move to V8 would make all this obsolete though, because then we can have QScriptEngine* QWebFrame::scriptEngine() and you can do everything you could ever imagine (with JavaScript :) I've updated it per your previous comment anyway - so ball in your court! QWebFrame::scriptEngine() sounds great though - can't wait! Am I missing a trick or is there a way of overriding the DOM Window's object properties with the properties of a QObject? I can't see it - hence the current patch to just set the values. 320859 7 robert 2010-12-12 10:47:30 -0800 Any thoughts on this? Will it be accepted? 342319 8 benjamin 2011-01-30 09:17:43 -0800 I am with Simon on this, I think we should not add more stuff to QWebFrame that are really related to the Script Engine. I think it is better to focus on exposing QtScript. 975144 9 jturcotte 2014-02-03 03:16:46 -0800 === Bulk closing of Qt bugs === If you believe that this bug report is still relevant for a non-Qt port of webkit.org, please re-open it and remove [Qt] from the summary. If you believe that this is still an important QtWebKit bug, please fill a new report at https://bugreports.qt-project.org and add a link to this issue. See http://qt-project.org/wiki/ReportingBugsInQt for additional guidelines. 68823 2010-09-25 05:47:51 -0700 2010-09-29 11:04:32 -0700 Patch bug-46566-20100925134749.patch text/plain 5055 robert ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC9BcGkv cXdlYmZyYW1lLmNwcAppbmRleCA3Mjk1YjgyODJkYTEwYjY1OTZkOWY5MWJjZjQ5NGM1MGRkNmQx YjFlLi5kYjI2N2Q2M2I0NmFkYjM2MTYyZjU3NjExYTAxMDhiZTEyZjBhMmVjIDEwMDY0NAotLS0g YS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJh bWUuY3BwCkBAIC01MzUsNiArNTM1LDUyIEBAIHZvaWQgUVdlYkZyYW1lOjphZGRUb0phdmFTY3Jp cHRXaW5kb3dPYmplY3QoY29uc3QgUVN0cmluZyAmbmFtZSwgUU9iamVjdCAqb2JqZWN0CiB9CiAK IC8qIQorICAgIFxmbiB2b2lkIFFXZWJGcmFtZTo6YWRkVG9KYXZhU2NyaXB0V2luZG93UHJvcGVy dHkoY29uc3QgUVN0cmluZyAmbmFtZSwgY29uc3QgUVZhcmlhbnQgJnZhbHVlLCBRU2NyaXB0RW5n aW5lOjpWYWx1ZU93bmVyc2hpcCBvd24pCisKKyAgICBNYWtlIFxhIHZhbHVlIGF2YWlsYWJsZSB1 bmRlciBcYSBuYW1lIGZyb20gd2l0aGluIHRoZSBmcmFtZSdzIEphdmFTY3JpcHQKKyAgICBjb250 ZXh0LiBUaGUgXGEgdmFsdWUgd2lsbCBiZSBpbnNlcnRlZCBhcyBhIHByb3BlcnR5IG9mIHRoZSBm cmFtZSdzIHdpbmRvdworICAgIG9iamVjdCBvciB3aWxsIG92ZXJyaWRlIHRoZSB2YWx1ZSBvZiB0 aGUgd2luZG93J3MgcHJvcGVydHkgaWYgaXQgYWxyZWFkeQorICAgIGV4aXN0cyAoc3VjaCBhcyB3 aW5kb3cuaW5uZXJIZWlnaHQpLgorCisgICAgSWYgeW91IHdhbnQgdG8gZW5zdXJlIHRoYXQgeW91 ciBwcm9wZXJ0aWVzIHJlbWFpbiBhY2Nlc3NpYmxlIGFmdGVyIGxvYWRpbmcgYQorICAgIG5ldyBV UkwsIHlvdSBzaG91bGQgYWRkIHRoZW0gaW4gYSBzbG90IGNvbm5lY3RlZCB0byB0aGUKKyAgICBq YXZhU2NyaXB0V2luZG93T2JqZWN0Q2xlYXJlZCgpIHNpZ25hbC4KKworICAgIElmIEphdmFzY3Jp cHQgaXMgbm90IGVuYWJsZWQgZm9yIHRoaXMgcGFnZSwgdGhlbiB0aGlzIG1ldGhvZCBkb2VzIG5v dGhpbmcuCisKKyAgICBUaGUgb3duZXJzaGlwIG9mIFxhIHZhbHVlIGlzIHNwZWNpZmllZCB1c2lu ZyBcYSBvd24uCisqLwordm9pZCBRV2ViRnJhbWU6OmFkZFRvSmF2YVNjcmlwdFdpbmRvd1Byb3Bl cnR5KGNvbnN0IFFTdHJpbmcgJm5hbWUsIGNvbnN0IFFWYXJpYW50ICZ2YWx1ZSwgUVNjcmlwdEVu Z2luZTo6VmFsdWVPd25lcnNoaXAgb3duZXJzaGlwKQoreworICAgIGlmICghcGFnZSgpLT5zZXR0 aW5ncygpLT50ZXN0QXR0cmlidXRlKFFXZWJTZXR0aW5nczo6SmF2YXNjcmlwdEVuYWJsZWQpKQor ICAgICAgICByZXR1cm47CisjaWYgVVNFKEpTQykKKyAgICBKU0M6OkpTTG9jayBsb2NrKEpTQzo6 U2lsZW5jZUFzc2VydGlvbnNPbmx5KTsKKyAgICBKU0RPTVdpbmRvdyogd2luZG93ID0gdG9KU0RP TVdpbmRvdyhkLT5mcmFtZSwgbWFpblRocmVhZE5vcm1hbFdvcmxkKCkpOworICAgIEpTQzo6Qmlu ZGluZ3M6OlJvb3RPYmplY3QqIHJvb3Q7CisgICAgaWYgKG93bmVyc2hpcCA9PSBRU2NyaXB0RW5n aW5lOjpRdE93bmVyc2hpcCkKKyAgICAgICAgcm9vdCA9IGQtPmZyYW1lLT5zY3JpcHQoKS0+Y2Fj aGVhYmxlQmluZGluZ1Jvb3RPYmplY3QoKTsKKyAgICBlbHNlCisgICAgICAgIHJvb3QgPSBkLT5m cmFtZS0+c2NyaXB0KCktPmJpbmRpbmdSb290T2JqZWN0KCk7CisKKyAgICBpZiAoIXdpbmRvdykg eworICAgICAgICBxRGVidWcoKSA8PCAiV2FybmluZzogY291bGRuJ3QgZ2V0IHdpbmRvdyBvYmpl Y3QiOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgSlNDOjpFeGVjU3RhdGUqIGV4ZWMg PSB3aW5kb3ctPmdsb2JhbEV4ZWMoKTsKKyAgICBKU0M6OlB1dFByb3BlcnR5U2xvdCBzbG90Owor ICAgIEpTQzo6SlNWYWx1ZSB2YWwgPSBKU0M6OkJpbmRpbmdzOjpjb252ZXJ0UVZhcmlhbnRUb1Zh bHVlKGV4ZWMsIHJvb3QsIHZhbHVlKTsKKyAgICB3aW5kb3ctPnB1dERpcmVjdChKU0M6OklkZW50 aWZpZXIoZXhlYywgbmFtZS50b1V0ZjgoKS5jb25zdERhdGEoKSksIHZhbCk7CisjZWxpZiBVU0Uo VjgpCisgICAgUVNjcmlwdEVuZ2luZSogZW5naW5lID0gZC0+ZnJhbWUtPnNjcmlwdCgpLT5xdFNj cmlwdEVuZ2luZSgpOworICAgIGlmICghZW5naW5lKQorICAgICAgICByZXR1cm47CisgICAgZW5n aW5lLT5nbG9iYWxPYmplY3QoKS5wcm9wZXJ0eSgid2luZG93Iikuc2V0UHJvcGVydHkobmFtZSwg UVNjcmlwdEVuZ2luZTo6bmV3VmFyaWFudCh2YWx1ZSkpOworI2VuZGlmCit9CisKKy8qIQogICAg IFJldHVybnMgdGhlIGZyYW1lJ3MgY29udGVudCBhcyBIVE1MLCBlbmNsb3NlZCBpbiBIVE1MIGFu ZCBCT0RZIHRhZ3MuCiAKICAgICBcc2Egc2V0SHRtbCgpLCB0b1BsYWluVGV4dCgpCmRpZmYgLS1n aXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUu aAppbmRleCBlNzhmYjA3NjcxN2Q2OTQ0OWE2ODNlZGMwYmI1NzNkMWJkNTFjZTViLi44MjI5ODFi ZjA4ZjA4MmJkNGIxNWU3OGZmYzkxNTlkNWZkNmFkNjdkIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQv QXBpL3F3ZWJmcmFtZS5oCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmgKQEAgLTEzMSw2 ICsxMzEsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGFkZFRvSmF2YVNjcmlwdFdpbmRvd09iamVj dChjb25zdCBRU3RyaW5nICZuYW1lLCBRT2JqZWN0ICpvYmplY3QpOwogICAgIHZvaWQgYWRkVG9K YXZhU2NyaXB0V2luZG93T2JqZWN0KGNvbnN0IFFTdHJpbmcgJm5hbWUsIFFPYmplY3QgKm9iamVj dCwgUVNjcmlwdEVuZ2luZTo6VmFsdWVPd25lcnNoaXAgb3duZXJzaGlwKTsKKyAgICB2b2lkIGFk ZFRvSmF2YVNjcmlwdFdpbmRvd1Byb3BlcnR5KGNvbnN0IFFTdHJpbmcgJm5hbWUsIGNvbnN0IFFW YXJpYW50ICZ2YWx1ZSwgUVNjcmlwdEVuZ2luZTo6VmFsdWVPd25lcnNoaXAgb3duZXJzaGlwKTsK ICAgICBRU3RyaW5nIHRvSHRtbCgpIGNvbnN0OwogICAgIFFTdHJpbmcgdG9QbGFpblRleHQoKSBj b25zdDsKICAgICBRU3RyaW5nIHJlbmRlclRyZWVEdW1wKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9X ZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCBmYWVkMTJmNzM3 MWRjYmVmNGZhNjM2ZTI1YzEzOWM4ZjYyYWVjNTQyLi5hMDY5NmNiNmE3MzlmNmQwODRmZTZhZmM4 ODRkMmYwY2Q5YjM5NWI3IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1dl YktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wOS0yNSAgUm9iZXJ0IEhv Z2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgW1F0XSBBZGQgUVdlYkZyYW1lOjphZGRUb0phdmFTY3JpcHRXaW5k b3dQcm9wZXJ0eSgpCisKKyAgICAgICAgQWRkIG9yIG92ZXJyaWRlIHByb3BlcnRpZXMgaW4gdGhl IERPTSBXaW5kb3cgb2JqZWN0LgorCisgICAgICAgIFRoaXMgaXMgbmVjZXNzYXJ5IGZvciBjbGll bnRzIHRoYXQgd2FudCB0byBjb250cm9sCisgICAgICAgIHRoZSB2YWx1ZXMgcmV0dXJuZWQgYnkg d2luZG93LmlubmVySGVpZ2h0LCB3aW5kb3cubmFtZSBhbmQgc28gb24uCisgICAgICAgIENsaWVu dHMgd2lsbCB3YW50IHRvIGRvIHRoaXMgdG8gZGVmZWF0IHNvbWUgb2YgdGhlIGF0dGFja3MKKyAg ICAgICAgb3V0bGluZWQgaW4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQxODAxLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00NjU2NgorCisgICAgICAgICogQXBpL3F3ZWJmcmFtZS5jcHA6CisgICAgICAgIChRV2ViRnJh bWU6OmFkZFRvSmF2YVNjcmlwdFdpbmRvd1Byb3BlcnR5KToKKyAgICAgICAgKiBBcGkvcXdlYmZy YW1lLmg6CisgICAgICAgICogdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwOgorCiAy MDEwLTA5LTI0ICBMdWl6IEFnb3N0aW5pICA8bHVpei5hZ29zdGluaUBvcGVuYm9zc2Eub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgpkaWZmIC0t Z2l0IGEvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcCBiL1dlYktp dC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAKaW5kZXggMmM2MzczOWE4MThk NzA5ZTUwNmExMjEyNDA1OTE1NTdmMTlkN2Y3Zi4uNjNhMWZjMTVhNzY1ZGRiMDg4YzE3MDQ4MzA1 NmQxMjgxYTNjYWE0NiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3Rf cXdlYmZyYW1lLmNwcAorKysgYi9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJh bWUuY3BwCkBAIC01ODUsNiArNTg1LDcgQEAgcHJpdmF0ZSBzbG90czoKICAgICB2b2lkIG92ZXJs b2FkZWRTbG90cygpOwogICAgIHZvaWQgZW51bWVyYXRlX2RhdGEoKTsKICAgICB2b2lkIGVudW1l cmF0ZSgpOworICAgIHZvaWQgb3ZlcmxvYWRKU1dpbmRvd1Byb3BlcnR5KCk7CiAgICAgdm9pZCBv YmplY3REZWxldGVkKCk7CiAgICAgdm9pZCB0eXBlQ29udmVyc2lvbigpOwogICAgIHZvaWQgYXJy YXlPYmplY3RFbnVtZXJhYmxlKCk7CkBAIC0yMDE2LDYgKzIwMTcsMTMgQEAgdm9pZCB0c3RfUVdl YkZyYW1lOjplbnVtZXJhdGVfZGF0YSgpCiAgICAgICAgIDw8ICJteVNsb3QoKSIgPDwgIm15T3Ro ZXJTbG90KCkiKTsKIH0KIAordm9pZCB0c3RfUVdlYkZyYW1lOjpvdmVybG9hZEpTV2luZG93UHJv cGVydHkoKQoreworICAgIG1fcGFnZS0+bWFpbkZyYW1lKCktPmFkZFRvSmF2YVNjcmlwdFdpbmRv d1Byb3BlcnR5KFFTdHJpbmcoInNjcmVlblgiKSwgUVZhcmlhbnQoOTk5KSwgUVNjcmlwdEVuZ2lu ZTo6U2NyaXB0T3duZXJzaGlwKTsKKworICAgIFFWRVJJRlkoZXZhbEpTVigid2luZG93LnNjcmVl blgiKSA9PSA5OTkpOworfQorCiB2b2lkIHRzdF9RV2ViRnJhbWU6OmVudW1lcmF0ZSgpCiB7CiAg ICAgUUZFVENIKFFTdHJpbmdMaXN0LCBleHBlY3RlZE5hbWVzKTsK 69222 2010-09-29 11:04:38 -0700 2011-02-08 12:12:00 -0800 Patch bug-46566-20100929190436.patch text/plain 6129 robert ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC9BcGkv cXdlYmZyYW1lLmNwcAppbmRleCA3Mjk1YjgyODJkYTEwYjY1OTZkOWY5MWJjZjQ5NGM1MGRkNmQx YjFlLi44NDg2NDFlM2ZkMWM0NDY1MWRjMmJhZTFiMjU1MDJhNDY2MDIwYzM3IDEwMDY0NAotLS0g YS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJh bWUuY3BwCkBAIC01MzUsNiArNTM1LDcyIEBAIHZvaWQgUVdlYkZyYW1lOjphZGRUb0phdmFTY3Jp cHRXaW5kb3dPYmplY3QoY29uc3QgUVN0cmluZyAmbmFtZSwgUU9iamVjdCAqb2JqZWN0CiB9CiAK IC8qIQorICAgIE1ha2UgXGEgdmFsdWUgYXZhaWxhYmxlIHVuZGVyIFxhIG5hbWUgZnJvbSB3aXRo aW4gdGhlIGZyYW1lJ3MgSmF2YVNjcmlwdAorICAgIGNvbnRleHQuIFRoZSBcYSB2YWx1ZSB3aWxs IGJlIGluc2VydGVkIGFzIGEgcHJvcGVydHkgb2YgdGhlIGZyYW1lJ3Mgd2luZG93CisgICAgb2Jq ZWN0IG9yIHdpbGwgb3ZlcnJpZGUgdGhlIHZhbHVlIG9mIHRoZSB3aW5kb3cncyBwcm9wZXJ0eSBp ZiBpdCBhbHJlYWR5CisgICAgZXhpc3RzIChzdWNoIGFzIHdpbmRvdy5pbm5lckhlaWdodCkuCisK KyAgICBJZiB5b3Ugd2FudCB0byBlbnN1cmUgdGhhdCB5b3VyIHByb3BlcnRpZXMgcmVtYWluIGFj Y2Vzc2libGUgYWZ0ZXIgbG9hZGluZyBhCisgICAgbmV3IFVSTCwgeW91IHNob3VsZCBhZGQgdGhl bSBpbiBhIHNsb3QgY29ubmVjdGVkIHRvIHRoZQorICAgIGphdmFTY3JpcHRXaW5kb3dPYmplY3RD bGVhcmVkKCkgc2lnbmFsLgorCisgICAgSWYgSmF2YXNjcmlwdCBpcyBub3QgZW5hYmxlZCBmb3Ig dGhpcyBwYWdlLCB0aGVuIHRoaXMgbWV0aG9kIGRvZXMgbm90aGluZy4KKworICAgIFRoZSBcYSB2 YWx1ZSB3aWxsIG5ldmVyIGJlIGV4cGxpY2l0bHkgZGVsZXRlZCBieSBRdFdlYktpdC4KKyovCit2 b2lkIFFXZWJGcmFtZTo6YWRkVG9KYXZhU2NyaXB0V2luZG93T2JqZWN0KGNvbnN0IFFTdHJpbmcg Jm5hbWUsIGNvbnN0IFFWYXJpYW50ICZ2YWx1ZSkKK3sKKyAgICBhZGRUb0phdmFTY3JpcHRXaW5k b3dPYmplY3QobmFtZSwgdmFsdWUsIFFTY3JpcHRFbmdpbmU6OlF0T3duZXJzaGlwKTsKK30KKwor LyohCisgICAgXGZuIHZvaWQgUVdlYkZyYW1lOjphZGRUb0phdmFTY3JpcHRXaW5kb3dPYmplY3Qo Y29uc3QgUVN0cmluZyAmbmFtZSwgY29uc3QgUVZhcmlhbnQgJnZhbHVlLCBRU2NyaXB0RW5naW5l OjpWYWx1ZU93bmVyc2hpcCBvd24pCisgICAgXG92ZXJsb2FkCisKKyAgICBNYWtlIFxhIHZhbHVl IGF2YWlsYWJsZSB1bmRlciBcYSBuYW1lIGZyb20gd2l0aGluIHRoZSBmcmFtZSdzIEphdmFTY3Jp cHQKKyAgICBjb250ZXh0LiBUaGUgXGEgdmFsdWUgd2lsbCBiZSBpbnNlcnRlZCBhcyBhIHByb3Bl cnR5IG9mIHRoZSBmcmFtZSdzIHdpbmRvdworICAgIG9iamVjdCBvciB3aWxsIG92ZXJyaWRlIHRo ZSB2YWx1ZSBvZiB0aGUgd2luZG93J3MgcHJvcGVydHkgaWYgaXQgYWxyZWFkeQorICAgIGV4aXN0 cyAoc3VjaCBhcyB3aW5kb3cuaW5uZXJIZWlnaHQpLgorCisgICAgSWYgeW91IHdhbnQgdG8gZW5z dXJlIHRoYXQgeW91ciBwcm9wZXJ0aWVzIHJlbWFpbiBhY2Nlc3NpYmxlIGFmdGVyIGxvYWRpbmcg YQorICAgIG5ldyBVUkwsIHlvdSBzaG91bGQgYWRkIHRoZW0gaW4gYSBzbG90IGNvbm5lY3RlZCB0 byB0aGUKKyAgICBqYXZhU2NyaXB0V2luZG93T2JqZWN0Q2xlYXJlZCgpIHNpZ25hbC4KKworICAg IElmIEphdmFzY3JpcHQgaXMgbm90IGVuYWJsZWQgZm9yIHRoaXMgcGFnZSwgdGhlbiB0aGlzIG1l dGhvZCBkb2VzIG5vdGhpbmcuCisKKyAgICBUaGUgb3duZXJzaGlwIG9mIFxhIHZhbHVlIGlzIHNw ZWNpZmllZCB1c2luZyBcYSBvd24uCisqLwordm9pZCBRV2ViRnJhbWU6OmFkZFRvSmF2YVNjcmlw dFdpbmRvd09iamVjdChjb25zdCBRU3RyaW5nICZuYW1lLCBjb25zdCBRVmFyaWFudCAmdmFsdWUs IFFTY3JpcHRFbmdpbmU6OlZhbHVlT3duZXJzaGlwIG93bmVyc2hpcCkKK3sKKyAgICBpZiAoIXBh Z2UoKS0+c2V0dGluZ3MoKS0+dGVzdEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6OkphdmFzY3JpcHRF bmFibGVkKSkKKyAgICAgICAgcmV0dXJuOworI2lmIFVTRShKU0MpCisgICAgSlNDOjpKU0xvY2sg bG9jayhKU0M6OlNpbGVuY2VBc3NlcnRpb25zT25seSk7CisgICAgSlNET01XaW5kb3cqIHdpbmRv dyA9IHRvSlNET01XaW5kb3coZC0+ZnJhbWUsIG1haW5UaHJlYWROb3JtYWxXb3JsZCgpKTsKKyAg ICBKU0M6OkJpbmRpbmdzOjpSb290T2JqZWN0KiByb290OworICAgIGlmIChvd25lcnNoaXAgPT0g UVNjcmlwdEVuZ2luZTo6UXRPd25lcnNoaXApCisgICAgICAgIHJvb3QgPSBkLT5mcmFtZS0+c2Ny aXB0KCktPmNhY2hlYWJsZUJpbmRpbmdSb290T2JqZWN0KCk7CisgICAgZWxzZQorICAgICAgICBy b290ID0gZC0+ZnJhbWUtPnNjcmlwdCgpLT5iaW5kaW5nUm9vdE9iamVjdCgpOworCisgICAgaWYg KCF3aW5kb3cpIHsKKyAgICAgICAgcURlYnVnKCkgPDwgIldhcm5pbmc6IGNvdWxkbid0IGdldCB3 aW5kb3cgb2JqZWN0IjsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIEpTQzo6RXhlY1N0 YXRlKiBleGVjID0gd2luZG93LT5nbG9iYWxFeGVjKCk7CisgICAgSlNDOjpQdXRQcm9wZXJ0eVNs b3Qgc2xvdDsKKyAgICBKU0M6OkpTVmFsdWUgdmFsID0gSlNDOjpCaW5kaW5nczo6Y29udmVydFFW YXJpYW50VG9WYWx1ZShleGVjLCByb290LCB2YWx1ZSk7CisgICAgd2luZG93LT5wdXREaXJlY3Qo SlNDOjpJZGVudGlmaWVyKGV4ZWMsIG5hbWUudG9VdGY4KCkuY29uc3REYXRhKCkpLCB2YWwpOwor I2VsaWYgVVNFKFY4KQorICAgIFFTY3JpcHRFbmdpbmUqIGVuZ2luZSA9IGQtPmZyYW1lLT5zY3Jp cHQoKS0+cXRTY3JpcHRFbmdpbmUoKTsKKyAgICBpZiAoIWVuZ2luZSkKKyAgICAgICAgcmV0dXJu OworICAgIGVuZ2luZS0+Z2xvYmFsT2JqZWN0KCkucHJvcGVydHkoIndpbmRvdyIpLnNldFByb3Bl cnR5KG5hbWUsIFFTY3JpcHRFbmdpbmU6Om5ld1ZhcmlhbnQodmFsdWUpKTsKKyNlbmRpZgorfQor CisvKiEKICAgICBSZXR1cm5zIHRoZSBmcmFtZSdzIGNvbnRlbnQgYXMgSFRNTCwgZW5jbG9zZWQg aW4gSFRNTCBhbmQgQk9EWSB0YWdzLgogCiAgICAgXHNhIHNldEh0bWwoKSwgdG9QbGFpblRleHQo KQpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuaCBiL1dlYktpdC9xdC9BcGkv cXdlYmZyYW1lLmgKaW5kZXggZTc4ZmIwNzY3MTdkNjk0NDlhNjgzZWRjMGJiNTczZDFiZDUxY2U1 Yi4uNGI1OTM2OGExMmE2ODE3NTMwOTI1Y2JkOGVmNGVhYjY3MmM3NjVhOCAxMDA2NDQKLS0tIGEv V2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuaAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5o CkBAIC0xMzAsNyArMTMwLDkgQEAgcHVibGljOgogICAgIHZvaWQgc2V0Q29udGVudChjb25zdCBR Qnl0ZUFycmF5ICZkYXRhLCBjb25zdCBRU3RyaW5nICZtaW1lVHlwZSA9IFFTdHJpbmcoKSwgY29u c3QgUVVybCAmYmFzZVVybCA9IFFVcmwoKSk7CiAKICAgICB2b2lkIGFkZFRvSmF2YVNjcmlwdFdp bmRvd09iamVjdChjb25zdCBRU3RyaW5nICZuYW1lLCBRT2JqZWN0ICpvYmplY3QpOworICAgIHZv aWQgYWRkVG9KYXZhU2NyaXB0V2luZG93T2JqZWN0KGNvbnN0IFFTdHJpbmcgJm5hbWUsIGNvbnN0 IFFWYXJpYW50ICZ2YWx1ZSk7CiAgICAgdm9pZCBhZGRUb0phdmFTY3JpcHRXaW5kb3dPYmplY3Qo Y29uc3QgUVN0cmluZyAmbmFtZSwgUU9iamVjdCAqb2JqZWN0LCBRU2NyaXB0RW5naW5lOjpWYWx1 ZU93bmVyc2hpcCBvd25lcnNoaXApOworICAgIHZvaWQgYWRkVG9KYXZhU2NyaXB0V2luZG93T2Jq ZWN0KGNvbnN0IFFTdHJpbmcgJm5hbWUsIGNvbnN0IFFWYXJpYW50ICZ2YWx1ZSwgUVNjcmlwdEVu Z2luZTo6VmFsdWVPd25lcnNoaXAgb3duZXJzaGlwKTsKICAgICBRU3RyaW5nIHRvSHRtbCgpIGNv bnN0OwogICAgIFFTdHJpbmcgdG9QbGFpblRleHQoKSBjb25zdDsKICAgICBRU3RyaW5nIHJlbmRl clRyZWVEdW1wKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2Vi S2l0L3F0L0NoYW5nZUxvZwppbmRleCBmYWVkMTJmNzM3MWRjYmVmNGZhNjM2ZTI1YzEzOWM4ZjYy YWVjNTQyLi4xZGNjNzU2MDI1NThlOWZiZTdmZjc4NmU2ZmI4YmE2ZjM5ZTE2NWZmIDEwMDY0NAot LS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxMC0wOS0yOSAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBP dmVybG9hZCBRV2ViRnJhbWU6OmFkZFRvSmF2YVNjcmlwdFdpbmRvd09iamVjdCgpCisKKyAgICAg ICAgVG8gYWxsb3cgY2xpZW50cyBhZGQgb3Igb3ZlcnJpZGUgcHJvcGVydGllcyBpbiB0aGUgRE9N IFdpbmRvdyBvYmplY3QuCisKKyAgICAgICAgVGhpcyBpcyBuZWNlc3NhcnkgZm9yIGNsaWVudHMg dGhhdCB3YW50IHRvIGNvbnRyb2wKKyAgICAgICAgdGhlIHZhbHVlcyByZXR1cm5lZCBieSB3aW5k b3cuaW5uZXJIZWlnaHQsIHdpbmRvdy5uYW1lIGFuZCBzbyBvbi4KKyAgICAgICAgQ2xpZW50cyB3 aWxsIHdhbnQgdG8gZG8gdGhpcyB0byBkZWZlYXQgc29tZSBvZiB0aGUgYXR0YWNrcworICAgICAg ICBvdXRsaW5lZCBpbiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDE4 MDEuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2 NTY2CisKKyAgICAgICAgTmVlZCBhIHNob3J0IGRlc2NyaXB0aW9uIGFuZCBidWcgVVJMIChPT1BT ISkKKworICAgICAgICAqIEFwaS9xd2ViZnJhbWUuY3BwOgorICAgICAgICAoUVdlYkZyYW1lOjph ZGRUb0phdmFTY3JpcHRXaW5kb3dPYmplY3QpOgorICAgICAgICAqIEFwaS9xd2ViZnJhbWUuaDoK KyAgICAgICAgKiB0ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHA6CisKIDIwMTAtMDkt MjQgIEx1aXogQWdvc3RpbmkgIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3NzYS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCmRpZmYgLS1naXQgYS9X ZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwIGIvV2ViS2l0L3F0L3Rl c3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcAppbmRleCAyYzYzNzM5YTgxOGQ3MDllNTA2 YTEyMTI0MDU5MTU1N2YxOWQ3ZjdmLi4xMzcwZjJmOWE0NTk1MDJlNmY1YzI4OWE5ODBiMDRlNTY4 ZjM2MTAxIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJh bWUuY3BwCisrKyBiL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAK QEAgLTU4NSw2ICs1ODUsNyBAQCBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgb3ZlcmxvYWRlZFNs b3RzKCk7CiAgICAgdm9pZCBlbnVtZXJhdGVfZGF0YSgpOwogICAgIHZvaWQgZW51bWVyYXRlKCk7 CisgICAgdm9pZCBvdmVybG9hZEpTV2luZG93UHJvcGVydHkoKTsKICAgICB2b2lkIG9iamVjdERl bGV0ZWQoKTsKICAgICB2b2lkIHR5cGVDb252ZXJzaW9uKCk7CiAgICAgdm9pZCBhcnJheU9iamVj dEVudW1lcmFibGUoKTsKQEAgLTIwMTYsNiArMjAxNywxMyBAQCB2b2lkIHRzdF9RV2ViRnJhbWU6 OmVudW1lcmF0ZV9kYXRhKCkKICAgICAgICAgPDwgIm15U2xvdCgpIiA8PCAibXlPdGhlclNsb3Qo KSIpOwogfQogCit2b2lkIHRzdF9RV2ViRnJhbWU6Om92ZXJsb2FkSlNXaW5kb3dQcm9wZXJ0eSgp Cit7CisgICAgbV9wYWdlLT5tYWluRnJhbWUoKS0+YWRkVG9KYXZhU2NyaXB0V2luZG93T2JqZWN0 KFFTdHJpbmcoInNjcmVlblgiKSwgUVZhcmlhbnQoOTk5KSwgUVNjcmlwdEVuZ2luZTo6U2NyaXB0 T3duZXJzaGlwKTsKKworICAgIFFWRVJJRlkoZXZhbEpTVigid2luZG93LnNjcmVlblgiKSA9PSA5 OTkpOworfQorCiB2b2lkIHRzdF9RV2ViRnJhbWU6OmVudW1lcmF0ZSgpCiB7CiAgICAgUUZFVENI KFFTdHJpbmdMaXN0LCBleHBlY3RlZE5hbWVzKTsK