15303 2007-09-28 03:07:37 -0700 Remove now-redundant code to restore dialog arguments after clear 2007-10-14 04:46:01 -0700 1 1 1 Unclassified WebKit DOM 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 mitz webkit-unassigned oldest_to_newest 57225 0 mitz 2007-09-28 03:07:37 -0700 Following <http://trac.webkit.org/projects/webkit/changeset/25783>, window properties, including dialog arguments, are not cleared when a newly created modal dialog loads its document. Therefore the code introduced in <http://trac.webkit.org/projects/webkit/changeset/25576> to protect dialog arguments is redundant. I have a patch that reverts it. 57226 1 16429 mitz 2007-09-28 03:14:23 -0700 Created attachment 16429 Remove code to restore dialog arguments 57227 2 16430 mitz 2007-09-28 03:22:44 -0700 Created attachment 16430 Remove code to restore dialog arguments ...without re-introducing coding style errors. 57397 3 16430 mjs 2007-09-29 19:29:19 -0700 Comment on attachment 16430 Remove code to restore dialog arguments r=me for trunk (since this won't actually change behavior, it's just a cleanup). 58488 4 mrowe 2007-10-14 04:46:01 -0700 Landed in r26584. 16429 2007-09-28 03:14:23 -0700 2007-09-30 00:12:29 -0700 Remove code to restore dialog arguments 15303_r1.diff text/plain 6428 mitz SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNTc5MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMDctMDktMjggIE1pdHogUGV0dGVsICA8bWl0ekB3ZWJraXQub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gaHR0 cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUzMDMKKyAgICAgICAgICBSZW1v dmUgbm93LXJlZHVuZGFudCBjb2RlIHRvIHJlc3RvcmUgZGlhbG9nIGFyZ3VtZW50cyBhZnRlciBj bGVhcgorCisgICAgICAgIFRoaXMgcGF0Y2ggcmV2ZXJ0cyB0aGUga2pzX3dpbmRvdy4qIHBhcnRz IG9mIHIyNTU3NiBiZWNhdXNlIGZvbGxvd2luZworICAgICAgICByMjU3ODMsIHdpbmRvdyBwcm9w ZXJ0aWVzLCBpbmNsdWRpbmcgZGlhbG9nIGFyZ3VtZW50cywgYXJlIG5vdCBjbGVhcmVkCisgICAg ICAgIHdoZW4gdGhlIG5ld2x5IGNyZWF0ZWQgbW9kYWwgZGlhbG9nIHRyYW5zaXRpb25zIHRvIHRo ZSBkb2N1bWVudC4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL2tqc193aW5kb3cuY3BwOgorICAg ICAgICAoS0pTOjpXaW5kb3dQcml2YXRlOjpXaW5kb3dQcml2YXRlKToKKyAgICAgICAgKEtKUzo6 Y3JlYXRlV2luZG93KToKKyAgICAgICAgKEtKUzo6c2hvd01vZGFsRGlhbG9nKToKKyAgICAgICAg KEtKUzo6V2luZG93OjpjbGVhcik6CisgICAgICAgIChLSlM6OldpbmRvd0Z1bmM6OmNhbGxBc0Z1 bmN0aW9uKToKKyAgICAgICAgKEtKUzo6V2luZG93OjpzZXRSZXR1cm5WYWx1ZVNsb3QpOgorICAg ICAgICAqIGJpbmRpbmdzL2pzL2tqc193aW5kb3cuaDoKKwogMjAwNy0wOS0yNyAgTWl0eiBQZXR0 ZWwgIDxtaXR6QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2ZSBIeWF0dC4K SW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvanMva2pzX3dpbmRvdy5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9iaW5kaW5ncy9qcy9ranNfd2luZG93LmNwcAkocmV2aXNpb24gMjU3OTIpCisrKyBX ZWJDb3JlL2JpbmRpbmdzL2pzL2tqc193aW5kb3cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NCw3 ICs4NCw2IEBAIHN0cnVjdCBXaW5kb3dQcml2YXRlIHsKICAgICBXaW5kb3dQcml2YXRlKCkgCiAg ICAgICAgIDogbG9jKDApCiAgICAgICAgICwgbV9ldnQoMCkKLSAgICAgICAgLCBtX2RpYWxvZ0Fy Z3VtZW50cygwKQogICAgICAgICAsIG1fcmV0dXJuVmFsdWVTbG90KDApCiAgICAgewogICAgIH0K QEAgLTk1LDggKzk0LDcgQEAgc3RydWN0IFdpbmRvd1ByaXZhdGUgewogICAgIFdpbmRvdzo6VW5w cm90ZWN0ZWRMaXN0ZW5lcnNNYXAganNVbnByb3RlY3RlZEhUTUxFdmVudExpc3RlbmVyczsKICAg ICBtdXRhYmxlIExvY2F0aW9uKiBsb2M7CiAgICAgV2ViQ29yZTo6RXZlbnQgKm1fZXZ0OwotICAg IEpTVmFsdWUqIG1fZGlhbG9nQXJndW1lbnRzOwotICAgIEpTVmFsdWUqKiBtX3JldHVyblZhbHVl U2xvdDsKKyAgICBKU1ZhbHVlICoqbV9yZXR1cm5WYWx1ZVNsb3Q7CiAgICAgdHlwZWRlZiBIYXNo TWFwPGludCwgRE9NV2luZG93VGltZXIqPiBUaW1lb3V0c01hcDsKICAgICBUaW1lb3V0c01hcCBt X3RpbWVvdXRzOwogfTsKQEAgLTM2MCw3ICszNTgsNyBAQCBzdGF0aWMgZmxvYXQgZmxvYXRGZWF0 dXJlKGNvbnN0IEhhc2hNYXA8CiB9CiAKIHN0YXRpYyBGcmFtZSogY3JlYXRlV2luZG93KEV4ZWNT dGF0ZSogZXhlYywgRnJhbWUqIG9wZW5lckZyYW1lLCBjb25zdCBTdHJpbmcmIHVybCwKLSAgICBj b25zdCBTdHJpbmcmIGZyYW1lTmFtZSwgY29uc3QgV2luZG93RmVhdHVyZXMmIHdpbmRvd0ZlYXR1 cmVzKQorICAgIGNvbnN0IFN0cmluZyYgZnJhbWVOYW1lLCBjb25zdCBXaW5kb3dGZWF0dXJlcyYg d2luZG93RmVhdHVyZXMsIEpTVmFsdWUqIGRpYWxvZ0FyZ3MpCiB7CiAgICAgRnJhbWUqIGFjdGl2 ZUZyYW1lID0gV2luZG93OjpyZXRyaWV2ZUFjdGl2ZShleGVjKS0+aW1wbCgpLT5mcmFtZSgpOwog ICAgIApAQCAtMzcyLDcgKzM3MCw3IEBAIHN0YXRpYyBGcmFtZSogY3JlYXRlV2luZG93KEV4ZWNT dGF0ZSogZXgKICAgICAvLyBGSVhNRTogSXQncyBtdWNoIGJldHRlciBmb3IgY2xpZW50IEFQSSBp ZiBhIG5ldyB3aW5kb3cgc3RhcnRzIHdpdGggYSBVUkwsIGhlcmUgd2hlcmUgd2UKICAgICAvLyBr bm93IHdoYXQgVVJMIHdlIGFyZSBnb2luZyB0byBvcGVuLiBVbmZvcnR1bmF0ZWx5LCB0aGlzIGNv ZGUgcGFzc2VzIHRoZSBlbXB0eSBzdHJpbmcKICAgICAvLyBmb3IgdGhlIFVSTCwgYnV0IHRoZXJl J3MgYSByZWFzb24gZm9yIHRoYXQuIEJlZm9yZSBsb2FkaW5nIHdlIGhhdmUgdG8gc2V0IHVwIHRo ZSBvcGVuZXIsCi0gICAgLy8gb3BlbmVkQnlET00sIGFuZCBkaWFsb2dBcmd1bWVudHMgdmFsdWVz LiBBbHNvLCB0byBkZWNpZGUgd2hldGhlciB0byB1c2UgdGhlIFVSTCB3ZSBjdXJyZW50bHkKKyAg ICAvLyBvcGVuZWRCeUpTLCBhbmQgZGlhbG9nQXJndW1lbnRzIHZhbHVlcy4gQWxzbywgdG8gZGVj aWRlIHdoZXRoZXIgdG8gdXNlIHRoZSBVUkwgd2UgY3VycmVudGx5CiAgICAgLy8gZG8gYW4gaXNT YWZlU2NyaXB0IGNhbGwgdXNpbmcgdGhlIHdpbmRvdyB3ZSBjcmVhdGUsIHdoaWNoIGNhbid0IGJl IGRvbmUgYmVmb3JlIGNyZWF0aW5nIGl0LgogICAgIC8vIFdlJ2QgaGF2ZSB0byByZXNvbHZlIGFs bCB0aG9zZSBpc3N1ZXMgdG8gcGFzcyB0aGUgVVJMIGluc3RlYWQgb2YgIiIuCiAKQEAgLTM4Niw2 ICszODQsOSBAQCBzdGF0aWMgRnJhbWUqIGNyZWF0ZVdpbmRvdyhFeGVjU3RhdGUqIGV4CiAKICAg ICBXaW5kb3cqIG5ld1dpbmRvdyA9IFdpbmRvdzo6cmV0cmlldmVXaW5kb3cobmV3RnJhbWUpOyAg ICAKICAgICAKKyAgICBpZiAoZGlhbG9nQXJncykKKyAgICAgICAgbmV3V2luZG93LT5wdXREaXJl Y3QoImRpYWxvZ0FyZ3VtZW50cyIsIGRpYWxvZ0FyZ3MpOworCiAgICAgaWYgKCF1cmwuc3RhcnRz V2l0aCgiamF2YXNjcmlwdDoiLCBmYWxzZSkgfHwgbmV3V2luZG93LT5pc1NhZmVTY3JpcHQoZXhl YykpIHsKICAgICAgICAgU3RyaW5nIGNvbXBsZXRlZFVSTCA9IHVybC5pc0VtcHR5KCkgPyB1cmwg OiBhY3RpdmVGcmFtZS0+ZG9jdW1lbnQoKS0+Y29tcGxldGVVUkwodXJsKTsKICAgICAgICAgYm9v bCB1c2VyR2VzdHVyZSA9IHN0YXRpY19jYXN0PFNjcmlwdEludGVycHJldGVyICo+KGV4ZWMtPmR5 bmFtaWNJbnRlcnByZXRlcigpKS0+d2FzUnVuQnlVc2VyR2VzdHVyZSgpOwpAQCAtNDc1LDIwICs0 NzYsMTggQEAgc3RhdGljIEpTVmFsdWUqIHNob3dNb2RhbERpYWxvZyhFeGVjU3RhdAogICAgIHdh cmdzLmxvY2F0aW9uQmFyVmlzaWJsZSA9IGZhbHNlOwogICAgIHdhcmdzLmZ1bGxzY3JlZW4gPSBm YWxzZTsKICAgICAKLSAgICBGcmFtZSogZGlhbG9nRnJhbWUgPSBjcmVhdGVXaW5kb3coZXhlYywg ZnJhbWUsIHZhbHVlVG9TdHJpbmdXaXRoVW5kZWZpbmVkT3JOdWxsQ2hlY2soZXhlYywgYXJnc1sw XSksICIiLCB3YXJncyk7CisgICAgRnJhbWUqIGRpYWxvZ0ZyYW1lID0gY3JlYXRlV2luZG93KGV4 ZWMsIGZyYW1lLCB2YWx1ZVRvU3RyaW5nV2l0aFVuZGVmaW5lZE9yTnVsbENoZWNrKGV4ZWMsIGFy Z3NbMF0pLCAiIiwgd2FyZ3MsIGFyZ3NbMV0pOwogICAgIGlmICghZGlhbG9nRnJhbWUpCiAgICAg ICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwogCiAgICAgV2luZG93KiBkaWFsb2dXaW5kb3cgPSBX aW5kb3c6OnJldHJpZXZlV2luZG93KGRpYWxvZ0ZyYW1lKTsKIAotICAgIGRpYWxvZ1dpbmRvdy0+ cHV0RGlyZWN0KCJkaWFsb2dBcmd1bWVudHMiLCBhcmdzWzFdKTsKLQogICAgIC8vIEdldCB0aGUg cmV0dXJuIHZhbHVlIGVpdGhlciBqdXN0IGJlZm9yZSBjbGVhcmluZyB0aGUgZGlhbG9nIHdpbmRv dydzCiAgICAgLy8gcHJvcGVydGllcyAoaW4gV2luZG93OjpjbGVhciksIG9yIHdoZW4gb24gcmV0 dXJuIGZyb20gcnVuTW9kYWwuCiAgICAgSlNWYWx1ZSogcmV0dXJuVmFsdWUgPSAwOwotICAgIGRp YWxvZ1dpbmRvdy0+c2V0RGlhbG9nQXJndW1lbnRzQW5kUmV0dXJuVmFsdWVTbG90KGFyZ3NbMV0s ICZyZXR1cm5WYWx1ZSk7CisgICAgZGlhbG9nV2luZG93LT5zZXRSZXR1cm5WYWx1ZVNsb3QoJnJl dHVyblZhbHVlKTsKICAgICBkaWFsb2dGcmFtZS0+cGFnZSgpLT5jaHJvbWUoKS0+cnVuTW9kYWwo KTsKLSAgICBkaWFsb2dXaW5kb3ctPnNldERpYWxvZ0FyZ3VtZW50c0FuZFJldHVyblZhbHVlU2xv dCgwLCAwKTsKKyAgICBkaWFsb2dXaW5kb3ctPnNldFJldHVyblZhbHVlU2xvdCgwKTsKIAogICAg IC8vIElmIHdlIGRvbid0IGhhdmUgYSByZXR1cm4gdmFsdWUsIGdldCBpdCBub3cuCiAgICAgLy8g RWl0aGVyIFdpbmRvdzo6Y2xlYXIgd2FzIG5vdCBjYWxsZWQgeWV0LCBvciB0aGVyZSB3YXMgbm8g cmV0dXJuIHZhbHVlLApAQCAtMTA0OSw5ICsxMDQ4LDYgQEAgdm9pZCBXaW5kb3c6OmNsZWFyKCkK ICAgaWYgKEZyYW1lKiBmcmFtZSA9IGltcGwoKS0+ZnJhbWUoKSkKICAgICBmcmFtZS0+c2NyaXB0 UHJveHkoKS0+aW50ZXJwcmV0ZXIoKS0+aW5pdEdsb2JhbE9iamVjdCgpOwogCi0gIGlmIChkLT5t X2RpYWxvZ0FyZ3VtZW50cykKLSAgICBwdXREaXJlY3QoImRpYWxvZ0FyZ3VtZW50cyIsIGQtPm1f ZGlhbG9nQXJndW1lbnRzKTsKLQogICAvLyB0aGVyZSdzIGxpa2VseSB0byBiZSBsb3RzIG9mIGdh cmJhZ2Ugbm93CiAgIGdjQ29udHJvbGxlcigpLmdhcmJhZ2VDb2xsZWN0U29vbigpOwogfQpAQCAt MTMwNCw3ICsxMzAwLDcgQEAgSlNWYWx1ZSAqV2luZG93RnVuYzo6Y2FsbEFzRnVuY3Rpb24oRXhl YwogICAgICAgd2luZG93RmVhdHVyZXMuaGVpZ2h0ID0gd2luZG93UmVjdC5oZWlnaHQoKTsKICAg ICAgIHdpbmRvd0ZlYXR1cmVzLndpZHRoID0gd2luZG93UmVjdC53aWR0aCgpOwogCi0gICAgICBm cmFtZSA9IGNyZWF0ZVdpbmRvdyhleGVjLCBmcmFtZSwgdXJsU3RyaW5nLCBmcmFtZU5hbWUsIHdp bmRvd0ZlYXR1cmVzKTsKKyAgICAgIGZyYW1lID0gY3JlYXRlV2luZG93KGV4ZWMsIGZyYW1lLCB1 cmxTdHJpbmcsIGZyYW1lTmFtZSwgd2luZG93RmVhdHVyZXMsIDApOwogCiAgICAgICBpZiAoIWZy YW1lKQogICAgICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwpAQCAtMTQ0NywxMCArMTQ0Myw5 IEBAIHZvaWQgV2luZG93Ojp1cGRhdGVMYXlvdXQoKSBjb25zdAogICAgIGRvY2ltcGwtPnVwZGF0 ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwogfQogCi12b2lkIFdpbmRvdzo6c2V0 RGlhbG9nQXJndW1lbnRzQW5kUmV0dXJuVmFsdWVTbG90KEpTVmFsdWUqIGRpYWxvZ0FyZ3MsIEpT VmFsdWUqKiByZXR1cm5WYWx1ZVNsb3QpCi17Ci0gICAgZC0+bV9kaWFsb2dBcmd1bWVudHMgPSBk aWFsb2dBcmdzOwotICAgIGQtPm1fcmV0dXJuVmFsdWVTbG90ID0gcmV0dXJuVmFsdWVTbG90OyAK K3ZvaWQgV2luZG93OjpzZXRSZXR1cm5WYWx1ZVNsb3QoSlNWYWx1ZSAqKnNsb3QpCit7IAorICAg IGQtPm1fcmV0dXJuVmFsdWVTbG90ID0gc2xvdDsgCiB9CiAKIC8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8gU2NoZWR1bGVkQWN0aW9uIC8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLwpJbmRleDogV2ViQ29y ZS9iaW5kaW5ncy9qcy9ranNfd2luZG93LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5n cy9qcy9ranNfd2luZG93LmgJKHJldmlzaW9uIDI1NzkyKQorKysgV2ViQ29yZS9iaW5kaW5ncy9q cy9ranNfd2luZG93LmgJKHdvcmtpbmcgY29weSkKQEAgLTEyOCw3ICsxMjgsNyBAQCBuYW1lc3Bh Y2UgS0pTIHsKICAgICB2b2lkIHNldEN1cnJlbnRFdmVudChXZWJDb3JlOjpFdmVudCopOwogCiAg ICAgLy8gU2V0IGEgcGxhY2UgdG8gcHV0IGEgZGlhbG9nIHJldHVybiB2YWx1ZSB3aGVuIHRoZSB3 aW5kb3cgaXMgY2xlYXJlZC4KLSAgICB2b2lkIHNldERpYWxvZ0FyZ3VtZW50c0FuZFJldHVyblZh bHVlU2xvdChKU1ZhbHVlKiBhcmd1bWVudHMsIEpTVmFsdWUqKiByZXR1cm5WYWx1ZVNsb3QpOwor ICAgIHZvaWQgc2V0UmV0dXJuVmFsdWVTbG90KEpTVmFsdWUgKipzbG90KTsKIAogICAgIHR5cGVk ZWYgSGFzaE1hcDxKU09iamVjdCosIFdlYkNvcmU6OkpTRXZlbnRMaXN0ZW5lcio+IExpc3RlbmVy c01hcDsKICAgICB0eXBlZGVmIEhhc2hNYXA8SlNPYmplY3QqLCBXZWJDb3JlOjpKU1VucHJvdGVj dGVkRXZlbnRMaXN0ZW5lcio+IFVucHJvdGVjdGVkTGlzdGVuZXJzTWFwOwo= 16430 2007-09-28 03:22:44 -0700 2007-09-29 19:29:19 -0700 Remove code to restore dialog arguments 15303_r2.diff text/plain 5663 mitz SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNTc5MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMDctMDktMjggIE1pdHogUGV0dGVsICA8bWl0ekB3ZWJraXQub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gaHR0 cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUzMDMKKyAgICAgICAgICBSZW1v dmUgbm93LXJlZHVuZGFudCBjb2RlIHRvIHJlc3RvcmUgZGlhbG9nIGFyZ3VtZW50cyBhZnRlciBj bGVhcgorCisgICAgICAgIFRoaXMgcGF0Y2ggcmV2ZXJ0cyB0aGUga2pzX3dpbmRvdy4qIHBhcnRz IG9mIHIyNTU3NiBiZWNhdXNlIGZvbGxvd2luZworICAgICAgICByMjU3ODMsIHdpbmRvdyBwcm9w ZXJ0aWVzLCBpbmNsdWRpbmcgZGlhbG9nIGFyZ3VtZW50cywgYXJlIG5vdCBjbGVhcmVkCisgICAg ICAgIHdoZW4gdGhlIG5ld2x5IGNyZWF0ZWQgbW9kYWwgZGlhbG9nIHRyYW5zaXRpb25zIHRvIHRo ZSBkb2N1bWVudC4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL2tqc193aW5kb3cuY3BwOgorICAg ICAgICAoS0pTOjpXaW5kb3dQcml2YXRlOjpXaW5kb3dQcml2YXRlKToKKyAgICAgICAgKEtKUzo6 Y3JlYXRlV2luZG93KToKKyAgICAgICAgKEtKUzo6c2hvd01vZGFsRGlhbG9nKToKKyAgICAgICAg KEtKUzo6V2luZG93OjpjbGVhcik6CisgICAgICAgIChLSlM6OldpbmRvd0Z1bmM6OmNhbGxBc0Z1 bmN0aW9uKToKKyAgICAgICAgKEtKUzo6V2luZG93OjpzZXRSZXR1cm5WYWx1ZVNsb3QpOgorICAg ICAgICAqIGJpbmRpbmdzL2pzL2tqc193aW5kb3cuaDoKKwogMjAwNy0wOS0yNyAgTWl0eiBQZXR0 ZWwgIDxtaXR6QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2ZSBIeWF0dC4K SW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvanMva2pzX3dpbmRvdy5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9iaW5kaW5ncy9qcy9ranNfd2luZG93LmNwcAkocmV2aXNpb24gMjU3OTIpCisrKyBX ZWJDb3JlL2JpbmRpbmdzL2pzL2tqc193aW5kb3cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NCw3 ICs4NCw2IEBAIHN0cnVjdCBXaW5kb3dQcml2YXRlIHsKICAgICBXaW5kb3dQcml2YXRlKCkgCiAg ICAgICAgIDogbG9jKDApCiAgICAgICAgICwgbV9ldnQoMCkKLSAgICAgICAgLCBtX2RpYWxvZ0Fy Z3VtZW50cygwKQogICAgICAgICAsIG1fcmV0dXJuVmFsdWVTbG90KDApCiAgICAgewogICAgIH0K QEAgLTk1LDcgKzk0LDYgQEAgc3RydWN0IFdpbmRvd1ByaXZhdGUgewogICAgIFdpbmRvdzo6VW5w cm90ZWN0ZWRMaXN0ZW5lcnNNYXAganNVbnByb3RlY3RlZEhUTUxFdmVudExpc3RlbmVyczsKICAg ICBtdXRhYmxlIExvY2F0aW9uKiBsb2M7CiAgICAgV2ViQ29yZTo6RXZlbnQgKm1fZXZ0OwotICAg IEpTVmFsdWUqIG1fZGlhbG9nQXJndW1lbnRzOwogICAgIEpTVmFsdWUqKiBtX3JldHVyblZhbHVl U2xvdDsKICAgICB0eXBlZGVmIEhhc2hNYXA8aW50LCBET01XaW5kb3dUaW1lcio+IFRpbWVvdXRz TWFwOwogICAgIFRpbWVvdXRzTWFwIG1fdGltZW91dHM7CkBAIC0zNjAsNyArMzU4LDcgQEAgc3Rh dGljIGZsb2F0IGZsb2F0RmVhdHVyZShjb25zdCBIYXNoTWFwPAogfQogCiBzdGF0aWMgRnJhbWUq IGNyZWF0ZVdpbmRvdyhFeGVjU3RhdGUqIGV4ZWMsIEZyYW1lKiBvcGVuZXJGcmFtZSwgY29uc3Qg U3RyaW5nJiB1cmwsCi0gICAgY29uc3QgU3RyaW5nJiBmcmFtZU5hbWUsIGNvbnN0IFdpbmRvd0Zl YXR1cmVzJiB3aW5kb3dGZWF0dXJlcykKKyAgICBjb25zdCBTdHJpbmcmIGZyYW1lTmFtZSwgY29u c3QgV2luZG93RmVhdHVyZXMmIHdpbmRvd0ZlYXR1cmVzLCBKU1ZhbHVlKiBkaWFsb2dBcmdzKQog ewogICAgIEZyYW1lKiBhY3RpdmVGcmFtZSA9IFdpbmRvdzo6cmV0cmlldmVBY3RpdmUoZXhlYykt PmltcGwoKS0+ZnJhbWUoKTsKICAgICAKQEAgLTM4Niw2ICszODQsOSBAQCBzdGF0aWMgRnJhbWUq IGNyZWF0ZVdpbmRvdyhFeGVjU3RhdGUqIGV4CiAKICAgICBXaW5kb3cqIG5ld1dpbmRvdyA9IFdp bmRvdzo6cmV0cmlldmVXaW5kb3cobmV3RnJhbWUpOyAgICAKICAgICAKKyAgICBpZiAoZGlhbG9n QXJncykKKyAgICAgICAgbmV3V2luZG93LT5wdXREaXJlY3QoImRpYWxvZ0FyZ3VtZW50cyIsIGRp YWxvZ0FyZ3MpOworCiAgICAgaWYgKCF1cmwuc3RhcnRzV2l0aCgiamF2YXNjcmlwdDoiLCBmYWxz ZSkgfHwgbmV3V2luZG93LT5pc1NhZmVTY3JpcHQoZXhlYykpIHsKICAgICAgICAgU3RyaW5nIGNv bXBsZXRlZFVSTCA9IHVybC5pc0VtcHR5KCkgPyB1cmwgOiBhY3RpdmVGcmFtZS0+ZG9jdW1lbnQo KS0+Y29tcGxldGVVUkwodXJsKTsKICAgICAgICAgYm9vbCB1c2VyR2VzdHVyZSA9IHN0YXRpY19j YXN0PFNjcmlwdEludGVycHJldGVyICo+KGV4ZWMtPmR5bmFtaWNJbnRlcnByZXRlcigpKS0+d2Fz UnVuQnlVc2VyR2VzdHVyZSgpOwpAQCAtNDc1LDIwICs0NzYsMTggQEAgc3RhdGljIEpTVmFsdWUq IHNob3dNb2RhbERpYWxvZyhFeGVjU3RhdAogICAgIHdhcmdzLmxvY2F0aW9uQmFyVmlzaWJsZSA9 IGZhbHNlOwogICAgIHdhcmdzLmZ1bGxzY3JlZW4gPSBmYWxzZTsKICAgICAKLSAgICBGcmFtZSog ZGlhbG9nRnJhbWUgPSBjcmVhdGVXaW5kb3coZXhlYywgZnJhbWUsIHZhbHVlVG9TdHJpbmdXaXRo VW5kZWZpbmVkT3JOdWxsQ2hlY2soZXhlYywgYXJnc1swXSksICIiLCB3YXJncyk7CisgICAgRnJh bWUqIGRpYWxvZ0ZyYW1lID0gY3JlYXRlV2luZG93KGV4ZWMsIGZyYW1lLCB2YWx1ZVRvU3RyaW5n V2l0aFVuZGVmaW5lZE9yTnVsbENoZWNrKGV4ZWMsIGFyZ3NbMF0pLCAiIiwgd2FyZ3MsIGFyZ3Nb MV0pOwogICAgIGlmICghZGlhbG9nRnJhbWUpCiAgICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgp OwogCiAgICAgV2luZG93KiBkaWFsb2dXaW5kb3cgPSBXaW5kb3c6OnJldHJpZXZlV2luZG93KGRp YWxvZ0ZyYW1lKTsKIAotICAgIGRpYWxvZ1dpbmRvdy0+cHV0RGlyZWN0KCJkaWFsb2dBcmd1bWVu dHMiLCBhcmdzWzFdKTsKLQogICAgIC8vIEdldCB0aGUgcmV0dXJuIHZhbHVlIGVpdGhlciBqdXN0 IGJlZm9yZSBjbGVhcmluZyB0aGUgZGlhbG9nIHdpbmRvdydzCiAgICAgLy8gcHJvcGVydGllcyAo aW4gV2luZG93OjpjbGVhciksIG9yIHdoZW4gb24gcmV0dXJuIGZyb20gcnVuTW9kYWwuCiAgICAg SlNWYWx1ZSogcmV0dXJuVmFsdWUgPSAwOwotICAgIGRpYWxvZ1dpbmRvdy0+c2V0RGlhbG9nQXJn dW1lbnRzQW5kUmV0dXJuVmFsdWVTbG90KGFyZ3NbMV0sICZyZXR1cm5WYWx1ZSk7CisgICAgZGlh bG9nV2luZG93LT5zZXRSZXR1cm5WYWx1ZVNsb3QoJnJldHVyblZhbHVlKTsKICAgICBkaWFsb2dG cmFtZS0+cGFnZSgpLT5jaHJvbWUoKS0+cnVuTW9kYWwoKTsKLSAgICBkaWFsb2dXaW5kb3ctPnNl dERpYWxvZ0FyZ3VtZW50c0FuZFJldHVyblZhbHVlU2xvdCgwLCAwKTsKKyAgICBkaWFsb2dXaW5k b3ctPnNldFJldHVyblZhbHVlU2xvdCgwKTsKIAogICAgIC8vIElmIHdlIGRvbid0IGhhdmUgYSBy ZXR1cm4gdmFsdWUsIGdldCBpdCBub3cuCiAgICAgLy8gRWl0aGVyIFdpbmRvdzo6Y2xlYXIgd2Fz IG5vdCBjYWxsZWQgeWV0LCBvciB0aGVyZSB3YXMgbm8gcmV0dXJuIHZhbHVlLApAQCAtMTA0OSw5 ICsxMDQ4LDYgQEAgdm9pZCBXaW5kb3c6OmNsZWFyKCkKICAgaWYgKEZyYW1lKiBmcmFtZSA9IGlt cGwoKS0+ZnJhbWUoKSkKICAgICBmcmFtZS0+c2NyaXB0UHJveHkoKS0+aW50ZXJwcmV0ZXIoKS0+ aW5pdEdsb2JhbE9iamVjdCgpOwogCi0gIGlmIChkLT5tX2RpYWxvZ0FyZ3VtZW50cykKLSAgICBw dXREaXJlY3QoImRpYWxvZ0FyZ3VtZW50cyIsIGQtPm1fZGlhbG9nQXJndW1lbnRzKTsKLQogICAv LyB0aGVyZSdzIGxpa2VseSB0byBiZSBsb3RzIG9mIGdhcmJhZ2Ugbm93CiAgIGdjQ29udHJvbGxl cigpLmdhcmJhZ2VDb2xsZWN0U29vbigpOwogfQpAQCAtMTMwNCw3ICsxMzAwLDcgQEAgSlNWYWx1 ZSAqV2luZG93RnVuYzo6Y2FsbEFzRnVuY3Rpb24oRXhlYwogICAgICAgd2luZG93RmVhdHVyZXMu aGVpZ2h0ID0gd2luZG93UmVjdC5oZWlnaHQoKTsKICAgICAgIHdpbmRvd0ZlYXR1cmVzLndpZHRo ID0gd2luZG93UmVjdC53aWR0aCgpOwogCi0gICAgICBmcmFtZSA9IGNyZWF0ZVdpbmRvdyhleGVj LCBmcmFtZSwgdXJsU3RyaW5nLCBmcmFtZU5hbWUsIHdpbmRvd0ZlYXR1cmVzKTsKKyAgICAgIGZy YW1lID0gY3JlYXRlV2luZG93KGV4ZWMsIGZyYW1lLCB1cmxTdHJpbmcsIGZyYW1lTmFtZSwgd2lu ZG93RmVhdHVyZXMsIDApOwogCiAgICAgICBpZiAoIWZyYW1lKQogICAgICAgICAgIHJldHVybiBq c1VuZGVmaW5lZCgpOwpAQCAtMTQ0NywxMCArMTQ0Myw5IEBAIHZvaWQgV2luZG93Ojp1cGRhdGVM YXlvdXQoKSBjb25zdAogICAgIGRvY2ltcGwtPnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHls ZXNoZWV0cygpOwogfQogCi12b2lkIFdpbmRvdzo6c2V0RGlhbG9nQXJndW1lbnRzQW5kUmV0dXJu VmFsdWVTbG90KEpTVmFsdWUqIGRpYWxvZ0FyZ3MsIEpTVmFsdWUqKiByZXR1cm5WYWx1ZVNsb3Qp Ci17Ci0gICAgZC0+bV9kaWFsb2dBcmd1bWVudHMgPSBkaWFsb2dBcmdzOwotICAgIGQtPm1fcmV0 dXJuVmFsdWVTbG90ID0gcmV0dXJuVmFsdWVTbG90OyAKK3ZvaWQgV2luZG93OjpzZXRSZXR1cm5W YWx1ZVNsb3QoSlNWYWx1ZSoqIHNsb3QpCit7IAorICAgIGQtPm1fcmV0dXJuVmFsdWVTbG90ID0g c2xvdDsgCiB9CiAKIC8vLy8vLy8vLy8vLy8vLy8vLy8vLy8gU2NoZWR1bGVkQWN0aW9uIC8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLwpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9qcy9ranNfd2luZG93 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9qcy9ranNfd2luZG93LmgJKHJldmlz aW9uIDI1NzkyKQorKysgV2ViQ29yZS9iaW5kaW5ncy9qcy9ranNfd2luZG93LmgJKHdvcmtpbmcg Y29weSkKQEAgLTEyOCw3ICsxMjgsNyBAQCBuYW1lc3BhY2UgS0pTIHsKICAgICB2b2lkIHNldEN1 cnJlbnRFdmVudChXZWJDb3JlOjpFdmVudCopOwogCiAgICAgLy8gU2V0IGEgcGxhY2UgdG8gcHV0 IGEgZGlhbG9nIHJldHVybiB2YWx1ZSB3aGVuIHRoZSB3aW5kb3cgaXMgY2xlYXJlZC4KLSAgICB2 b2lkIHNldERpYWxvZ0FyZ3VtZW50c0FuZFJldHVyblZhbHVlU2xvdChKU1ZhbHVlKiBhcmd1bWVu dHMsIEpTVmFsdWUqKiByZXR1cm5WYWx1ZVNsb3QpOworICAgIHZvaWQgc2V0UmV0dXJuVmFsdWVT bG90KEpTVmFsdWUqKiBzbG90KTsKIAogICAgIHR5cGVkZWYgSGFzaE1hcDxKU09iamVjdCosIFdl YkNvcmU6OkpTRXZlbnRMaXN0ZW5lcio+IExpc3RlbmVyc01hcDsKICAgICB0eXBlZGVmIEhhc2hN YXA8SlNPYmplY3QqLCBXZWJDb3JlOjpKU1VucHJvdGVjdGVkRXZlbnRMaXN0ZW5lcio+IFVucHJv dGVjdGVkTGlzdGVuZXJzTWFwOwo=