39377 2010-05-19 13:33:14 -0700 REGRESSION(r59240): "Might cause crashes in GTK+ bots" (Requested by xan_ on #webkit). 2010-05-19 16:02:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 21594 1 webkit.review.bot webkit-unassigned abarth commit-queue eric mrobinson xan.lopez oldest_to_newest 227971 0 webkit.review.bot 2010-05-19 13:33:14 -0700 http://trac.webkit.org/changeset/59240 broke the build: "Might cause crashes in GTK+ bots" (Requested by xan_ on #webkit). This is an automatic bug report generated by the sheriff-bot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests case pain. "Only you can prevent forest fires." -- Smokey the Bear 227972 1 56515 webkit.review.bot 2010-05-19 13:33:25 -0700 Created attachment 56515 ROLLOUT of r59240 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID --ignore-builders where ATTACHMENT_ID is the ID of this attachment. 227978 2 56515 xan.lopez 2010-05-19 13:36:45 -0700 Comment on attachment 56515 ROLLOUT of r59240 Go. 227983 3 56515 commit-queue 2010-05-19 13:55:09 -0700 Comment on attachment 56515 ROLLOUT of r59240 Clearing flags on attachment: 56515 Committed r59783: <http://trac.webkit.org/changeset/59783> 227984 4 commit-queue 2010-05-19 13:55:14 -0700 All reviewed patches have been landed. Closing bug. 228034 5 webkit.review.bot 2010-05-19 16:02:25 -0700 http://trac.webkit.org/changeset/59783 might have broken GTK Linux 32-bit Debug The following changes are on the blame list: http://trac.webkit.org/changeset/59784 http://trac.webkit.org/changeset/59785 http://trac.webkit.org/changeset/59783 56515 2010-05-19 13:33:25 -0700 2010-05-19 13:55:09 -0700 ROLLOUT of r59240 bug-39377-20100519203323.patch text/plain 29527 webkit.review.bot ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggMTlkMzJjZDQ3MDU1ZjdkNjE4ZWZmZDFlOGViNzEwZjBhMmRhMzhmYS4uZmJkZTZlNTU3 Zjc2ZDM2MjQzZDM4NDI1ZjVhMzA5YzgzNmI4Y2I1NiAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9D aGFuZ2VMb2cKKysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSw1OCBAQAorMjAx MC0wNS0xOSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CisKKyAg ICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjU5MjQwLgorICAgICAgICBodHRwOi8vdHJh Yy53ZWJraXQub3JnL2NoYW5nZXNldC81OTI0MAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzkzNzcKKworICAgICAgICAiTWlnaHQgY2F1c2UgY3Jhc2hl cyBpbiBHVEsrIGJvdHMiIChSZXF1ZXN0ZWQgYnkgeGFuXyBvbgorICAgICAgICAjd2Via2l0KS4K KworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0NvbnRleHRNZW51Q2xpZW50R3RrLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6aW5wdXRNZXRob2RzTWVudUl0ZW0pOgorICAgICAgICAqIFdlYkNvcmVT dXBwb3J0L0VkaXRvckNsaWVudEd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OkVkaXRvckNsaWVu dDo6c2V0SW5wdXRNZXRob2RTdGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OkVkaXRvckNsaWVudDo6 cmVzcG9uZFRvQ2hhbmdlZFNlbGVjdGlvbik6CisgICAgICAgIChXZWJLaXQ6OkVkaXRvckNsaWVu dDo6aGFuZGxlSW5wdXRNZXRob2RLZXlkb3duKToKKyAgICAgICAgKFdlYktpdDo6RWRpdG9yQ2xp ZW50OjpFZGl0b3JDbGllbnQpOgorICAgICAgICAoV2ViS2l0OjpFZGl0b3JDbGllbnQ6On5FZGl0 b3JDbGllbnQpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3Rr LmNwcDoKKyAgICAgICAgKFdlYktpdDo6cG9zdENvbW1pdEZyYW1lVmlld1NldHVwKToKKyAgICAg ICAgKiB3ZWJraXQvd2Via2l0cHJpdmF0ZS5oOgorICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJ2 aWV3LmNwcDoKKyAgICAgICAgKGRlc3Ryb3lfbWVudV9jYik6CisgICAgICAgICh3ZWJraXRfd2Vi X3ZpZXdfZm9yd2FyZF9jb250ZXh0X21lbnVfZXZlbnQpOgorICAgICAgICAod2Via2l0X3dlYl92 aWV3X2tleV9yZWxlYXNlX2V2ZW50KToKKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19idXR0b25f cmVsZWFzZV9ldmVudCk6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfZm9jdXNfaW5fZXZlbnQp OgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2ZvY3VzX291dF9ldmVudCk6CisgICAgICAgICh3 ZWJraXRfd2ViX3ZpZXdfcmVhbGl6ZSk6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfc2V0X3Nj cm9sbF9hZGp1c3RtZW50cyk6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfZGlzcG9zZSk6Cisg ICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfZmluYWxpemUpOgorICAgICAgICAod2ViVmlld0dldERQ SSk6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfc2NyZWVuX2NoYW5nZWQpOgorICAgICAgICAo d2Via2l0X3dlYl92aWV3X3F1ZXJ5X3Rvb2x0aXApOgorICAgICAgICAod2Via2l0X3dlYl92aWV3 X2dldF9pbV9jb250ZXh0KToKKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld191cGRhdGVfc2V0dGlu Z3MpOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2luaXQpOgorICAgICAgICAod2Via2l0X3dl Yl92aWV3X3NldF9zZXR0aW5ncyk6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfZ2V0X3NldHRp bmdzKToKKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19nZXRfaW5zcGVjdG9yKToKKyAgICAgICAg KHdlYmtpdF93ZWJfdmlld19zZXRfd2luZG93X2ZlYXR1cmVzKToKKyAgICAgICAgKHdlYmtpdF93 ZWJfdmlld19nZXRfd2luZG93X2ZlYXR1cmVzKToKKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19n ZXRfYmFja19mb3J3YXJkX2xpc3QpOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X3pvb21faW4p OgorICAgICAgICAod2Via2l0X3dlYl92aWV3X3pvb21fb3V0KToKKyAgICAgICAgKHdlYmtpdF93 ZWJfdmlld19nZXRfZW5jb2RpbmcpOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2dldF9jdXN0 b21fZW5jb2RpbmcpOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2FkZF9yZXNvdXJjZSk6Cisg ICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfZ2V0X3Jlc291cmNlKToKKyAgICAgICAgKHdlYmtpdF93 ZWJfdmlld19nZXRfbWFpbl9yZXNvdXJjZSk6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfY2xl YXJfcmVzb3VyY2VzKToKKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19nZXRfc3VicmVzb3VyY2Vz KToKKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19zZXRfdG9vbHRpcF90ZXh0KToKKyAgICAgICAg KHdlYmtpdF93ZWJfdmlld19nZXRfaWNvbl91cmkpOgorCiAyMDEwLTA1LTE4ICBNYXJ0aW4gUm9i aW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBYYW4g TG9wZXouCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0NvbnRleHRNZW51 Q2xpZW50R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ29udGV4dE1lbnVDbGll bnRHdGsuY3BwCmluZGV4IDA2OWZiMTliMWI5ZGM0NWJlZDE2YzcwMjQ0N2Y3OTQ3ZGRkMzk0NGEu LjVjMWJjMGI4ZDRkMTU4MjhjNjVhNGJlY2FkOWVjMTgwNzhhZGMwMGEgMTAwNjQ0Ci0tLSBhL1dl YktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ29udGV4dE1lbnVDbGllbnRHdGsuY3BwCisrKyBiL1dl YktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ29udGV4dE1lbnVDbGllbnRHdGsuY3BwCkBAIC02Miw3 ICs2Miw3IEBAIHN0YXRpYyBHdGtXaWRnZXQqIGlucHV0TWV0aG9kc01lbnVJdGVtIChXZWJLaXRX ZWJWaWV3KiB3ZWJWaWV3KQogCiAgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSBXRUJL SVRfV0VCX1ZJRVdfR0VUX1BSSVZBVEUod2ViVmlldyk7CiAgICAgR3RrV2lkZ2V0KiBpbUNvbnRl eHRNZW51ID0gZ3RrX21lbnVfbmV3KCk7Ci0gICAgZ3RrX2ltX211bHRpY29udGV4dF9hcHBlbmRf bWVudWl0ZW1zKEdUS19JTV9NVUxUSUNPTlRFWFQocHJpdi0+aW1Db250ZXh0LmdldCgpKSwgR1RL X01FTlVfU0hFTEwoaW1Db250ZXh0TWVudSkpOworICAgIGd0a19pbV9tdWx0aWNvbnRleHRfYXBw ZW5kX21lbnVpdGVtcyhHVEtfSU1fTVVMVElDT05URVhUKHByaXYtPmltQ29udGV4dCksIEdUS19N RU5VX1NIRUxMKGltQ29udGV4dE1lbnUpKTsKIAogICAgIGd0a19tZW51X2l0ZW1fc2V0X3N1Ym1l bnUoR1RLX01FTlVfSVRFTShtZW51aXRlbSksIGltQ29udGV4dE1lbnUpOwogCmRpZmYgLS1naXQg YS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEd0ay5jcHAgYi9XZWJLaXQv Z3RrL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEd0ay5jcHAKaW5kZXggZDNmOGZhMTk1ZDRi OWE2NDAzNzAyYTY0YTYxYjZmOTJjNmUyMjAyYS4uYTVjMzZlODMzYTY4YTc1YTg4YmYxNDcyMjll YjEyMjU1NDRlNjJjMSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9FZGl0 b3JDbGllbnRHdGsuY3BwCisrKyBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xp ZW50R3RrLmNwcApAQCAtMjIwLDE1ICsyMjAsMTUgQEAgdm9pZCBFZGl0b3JDbGllbnQ6OnNldElu cHV0TWV0aG9kU3RhdGUoYm9vbCBhY3RpdmUpCiAgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHBy aXYgPSBtX3dlYlZpZXctPnByaXY7CiAKICAgICBpZiAoYWN0aXZlKQotICAgICAgICBndGtfaW1f Y29udGV4dF9mb2N1c19pbihwcml2LT5pbUNvbnRleHQuZ2V0KCkpOworICAgICAgICBndGtfaW1f Y29udGV4dF9mb2N1c19pbihwcml2LT5pbUNvbnRleHQpOwogICAgIGVsc2UKLSAgICAgICAgZ3Rr X2ltX2NvbnRleHRfZm9jdXNfb3V0KHByaXYtPmltQ29udGV4dC5nZXQoKSk7CisgICAgICAgIGd0 a19pbV9jb250ZXh0X2ZvY3VzX291dChwcml2LT5pbUNvbnRleHQpOwogCiAjaWZkZWYgTUFFTU9f Q0hBTkdFUwogICAgIGlmIChhY3RpdmUpCi0gICAgICAgIGhpbGRvbl9ndGtfaW1fY29udGV4dF9z aG93KHByaXYtPmltQ29udGV4dC5nZXQoKSk7CisgICAgICAgIGhpbGRvbl9ndGtfaW1fY29udGV4 dF9zaG93KHByaXYtPmltQ29udGV4dCk7CiAgICAgZWxzZQotICAgICAgICBoaWxkb25fZ3RrX2lt X2NvbnRleHRfaGlkZShwcml2LT5pbUNvbnRleHQuZ2V0KCkpOworICAgICAgICBoaWxkb25fZ3Rr X2ltX2NvbnRleHRfaGlkZShwcml2LT5pbUNvbnRleHQpOwogI2VuZGlmCiB9CiAKQEAgLTM2Nyw3 ICszNjcsNyBAQCB2b2lkIEVkaXRvckNsaWVudDo6cmVzcG9uZFRvQ2hhbmdlZFNlbGVjdGlvbigp CiAgICAgdW5zaWduZWQgZW5kOwogICAgIGlmICghdGFyZ2V0RnJhbWUtPmVkaXRvcigpLT5nZXRD b21wb3NpdGlvblNlbGVjdGlvbihzdGFydCwgZW5kKSkgewogICAgICAgICAvLyBndGtfaW1fY29u dGV4dF9yZXNldCgpIGNsZWFycyB0aGUgY29tcG9zaXRpb24gZm9yIHVzLgotICAgICAgICBndGtf aW1fY29udGV4dF9yZXNldChwcml2LT5pbUNvbnRleHQuZ2V0KCkpOworICAgICAgICBndGtfaW1f Y29udGV4dF9yZXNldChwcml2LT5pbUNvbnRleHQpOwogICAgICAgICB0YXJnZXRGcmFtZS0+ZWRp dG9yKCktPmNvbmZpcm1Db21wb3NpdGlvbldpdGhvdXREaXN0dXJiaW5nU2VsZWN0aW9uKCk7CiAg ICAgfQogfQpAQCAtNzAwLDcgKzcwMCw3IEBAIHZvaWQgRWRpdG9yQ2xpZW50OjpoYW5kbGVJbnB1 dE1ldGhvZEtleWRvd24oS2V5Ym9hcmRFdmVudCogZXZlbnQpCiAgICAgbV90cmVhdENvbnRleHRD b21taXRBc0tleUV2ZW50ID0gKCF0YXJnZXRGcmFtZS0+ZWRpdG9yKCktPmhhc0NvbXBvc2l0aW9u KCkpCiAgICAgICAgICAmJiBldmVudC0+a2V5RXZlbnQoKS0+Z2RrRXZlbnRLZXkoKS0+a2V5dmFs OwogICAgIGNsZWFyUGVuZGluZ0NvbXBvc2l0aW9uKCk7Ci0gICAgaWYgKChndGtfaW1fY29udGV4 dF9maWx0ZXJfa2V5cHJlc3MocHJpdi0+aW1Db250ZXh0LmdldCgpLCBldmVudC0+a2V5RXZlbnQo KS0+Z2RrRXZlbnRLZXkoKSkgJiYgIW1fcGVuZGluZ0NvbXBvc2l0aW9uKQorICAgIGlmICgoZ3Rr X2ltX2NvbnRleHRfZmlsdGVyX2tleXByZXNzKHByaXYtPmltQ29udGV4dCwgZXZlbnQtPmtleUV2 ZW50KCktPmdka0V2ZW50S2V5KCkpICYmICFtX3BlbmRpbmdDb21wb3NpdGlvbikKICAgICAgICAg fHwgKCFtX3RyZWF0Q29udGV4dENvbW1pdEFzS2V5RXZlbnQgJiYgIXRhcmdldEZyYW1lLT5lZGl0 b3IoKS0+aGFzQ29tcG9zaXRpb24oKSkpCiAgICAgICAgIGV2ZW50LT5wcmV2ZW50RGVmYXVsdCgp OwogCkBAIC03MTQsOCArNzE0LDggQEAgRWRpdG9yQ2xpZW50OjpFZGl0b3JDbGllbnQoV2ViS2l0 V2ViVmlldyogd2ViVmlldykKICAgICAsIG1fbmF0aXZlV2lkZ2V0KGd0a190ZXh0X3ZpZXdfbmV3 KCkpCiB7CiAgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSBtX3dlYlZpZXctPnByaXY7 Ci0gICAgZ19zaWduYWxfY29ubmVjdChwcml2LT5pbUNvbnRleHQuZ2V0KCksICJjb21taXQiLCBH X0NBTExCQUNLKGltQ29udGV4dENvbW1pdHRlZCksIHRoaXMpOwotICAgIGdfc2lnbmFsX2Nvbm5l Y3QocHJpdi0+aW1Db250ZXh0LmdldCgpLCAicHJlZWRpdC1jaGFuZ2VkIiwgR19DQUxMQkFDSyhp bUNvbnRleHRQcmVlZGl0Q2hhbmdlZCksIHRoaXMpOworICAgIGdfc2lnbmFsX2Nvbm5lY3QocHJp di0+aW1Db250ZXh0LCAiY29tbWl0IiwgR19DQUxMQkFDSyhpbUNvbnRleHRDb21taXR0ZWQpLCB0 aGlzKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0KHByaXYtPmltQ29udGV4dCwgInByZWVkaXQtY2hh bmdlZCIsIEdfQ0FMTEJBQ0soaW1Db250ZXh0UHJlZWRpdENoYW5nZWQpLCB0aGlzKTsKIAogICAg IGdfc2lnbmFsX2Nvbm5lY3QobV9uYXRpdmVXaWRnZXQuZ2V0KCksICJiYWNrc3BhY2UiLCBHX0NB TExCQUNLKGJhY2tzcGFjZUNhbGxiYWNrKSwgdGhpcyk7CiAgICAgZ19zaWduYWxfY29ubmVjdCht X25hdGl2ZVdpZGdldC5nZXQoKSwgImN1dC1jbGlwYm9hcmQiLCBHX0NBTExCQUNLKGN1dENsaXBi b2FyZENhbGxiYWNrKSwgdGhpcyk7CkBAIC03MjksOCArNzI5LDggQEAgRWRpdG9yQ2xpZW50OjpF ZGl0b3JDbGllbnQoV2ViS2l0V2ViVmlldyogd2ViVmlldykKIEVkaXRvckNsaWVudDo6fkVkaXRv ckNsaWVudCgpCiB7CiAgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSBtX3dlYlZpZXct PnByaXY7Ci0gICAgZ19zaWduYWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9mdW5jKHByaXYtPmlt Q29udGV4dC5nZXQoKSwgKGdwb2ludGVyKWltQ29udGV4dENvbW1pdHRlZCwgdGhpcyk7Ci0gICAg Z19zaWduYWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9mdW5jKHByaXYtPmltQ29udGV4dC5nZXQo KSwgKGdwb2ludGVyKWltQ29udGV4dFByZWVkaXRDaGFuZ2VkLCB0aGlzKTsKKyAgICBnX3NpZ25h bF9oYW5kbGVyc19kaXNjb25uZWN0X2J5X2Z1bmMocHJpdi0+aW1Db250ZXh0LCAoZ3BvaW50ZXIp aW1Db250ZXh0Q29tbWl0dGVkLCB0aGlzKTsKKyAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25u ZWN0X2J5X2Z1bmMocHJpdi0+aW1Db250ZXh0LCAoZ3BvaW50ZXIpaW1Db250ZXh0UHJlZWRpdENo YW5nZWQsIHRoaXMpOwogfQogCiB2b2lkIEVkaXRvckNsaWVudDo6dGV4dEZpZWxkRGlkQmVnaW5F ZGl0aW5nKEVsZW1lbnQqKQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9G cmFtZUxvYWRlckNsaWVudEd0ay5jcHAgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1l TG9hZGVyQ2xpZW50R3RrLmNwcAppbmRleCAxZmU2YjBmZDc5NDY4MjQ0ZmE3NzNhOTQxNGJmZTAy YWJmZTQ0YjNiLi5mZDJkN2VkM2VlYWI1NzBiNTEzYWQyNTg4OTdjOTFmOTA2ZDIzMGJmIDEwMDY0 NAotLS0gYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNw cAorKysgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNw cApAQCAtMTEzNSwxMSArMTEzNSwxNCBAQCBzdGF0aWMgdm9pZCBwb3N0Q29tbWl0RnJhbWVWaWV3 U2V0dXAoV2ViS2l0V2ViRnJhbWUgKmZyYW1lLCBGcmFtZVZpZXcgKnZpZXcsIGJvbwogewogICAg IFdlYktpdFdlYlZpZXcqIGNvbnRhaW5pbmdXaW5kb3cgPSBnZXRWaWV3RnJvbUZyYW1lKGZyYW1l KTsKICAgICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IFdFQktJVF9XRUJfVklFV19HRVRf UFJJVkFURShjb250YWluaW5nV2luZG93KTsKLSAgICB2aWV3LT5zZXRHdGtBZGp1c3RtZW50cyhw cml2LT5ob3Jpem9udGFsQWRqdXN0bWVudC5nZXQoKSwgcHJpdi0+dmVydGljYWxBZGp1c3RtZW50 LmdldCgpLCByZXNldFZhbHVlcyk7CisgICAgdmlldy0+c2V0R3RrQWRqdXN0bWVudHMocHJpdi0+ aG9yaXpvbnRhbEFkanVzdG1lbnQsIHByaXYtPnZlcnRpY2FsQWRqdXN0bWVudCwgcmVzZXRWYWx1 ZXMpOwogCiAgICAgaWYgKHByaXYtPmN1cnJlbnRNZW51KSB7Ci0gICAgICAgIGd0a19tZW51X3Bv cGRvd24ocHJpdi0+Y3VycmVudE1lbnUuZ2V0KCkpOwotICAgICAgICBwcml2LT5jdXJyZW50TWVu dS5jbGVhcigpOworICAgICAgICBHdGtNZW51KiBtZW51ID0gcHJpdi0+Y3VycmVudE1lbnU7Cisg ICAgICAgIHByaXYtPmN1cnJlbnRNZW51ID0gMDsKKworICAgICAgICBndGtfbWVudV9wb3Bkb3du KG1lbnUpOworICAgICAgICBnX29iamVjdF91bnJlZihtZW51KTsKICAgICB9CiB9CiAKZGlmZiAt LWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUuaCBiL1dlYktpdC9ndGsvd2Vi a2l0L3dlYmtpdHByaXZhdGUuaAppbmRleCBhYmNhM2M4M2NjNDMwNDM5MzMxZGI2N2ZjZmY0NzJi NDI2ODMxZmUzLi4wNTdiMGU1YWNhN2E2ZGJmNTEwNTg5MTBiNzYxY2IwOWI4MDdmNDRjIDEwMDY0 NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmgKKysrIGIvV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5oCkBAIC0xMTUsNDIgKzExNSw0MiBAQCBleHRlcm4gIkMi IHsKICAgICB0eXBlZGVmIHN0cnVjdCBfV2ViS2l0V2ViVmlld1ByaXZhdGUgV2ViS2l0V2ViVmll d1ByaXZhdGU7CiAgICAgc3RydWN0IF9XZWJLaXRXZWJWaWV3UHJpdmF0ZSB7CiAgICAgICAgIFdl YkNvcmU6OlBhZ2UqIGNvcmVQYWdlOwotICAgICAgICBHUmVmUHRyPFdlYktpdFdlYlNldHRpbmdz PiB3ZWJTZXR0aW5nczsKLSAgICAgICAgR1JlZlB0cjxXZWJLaXRXZWJJbnNwZWN0b3I+IHdlYklu c3BlY3RvcjsKLSAgICAgICAgR1JlZlB0cjxXZWJLaXRXZWJXaW5kb3dGZWF0dXJlcz4gd2ViV2lu ZG93RmVhdHVyZXM7CisgICAgICAgIFdlYktpdFdlYlNldHRpbmdzKiB3ZWJTZXR0aW5nczsKKyAg ICAgICAgV2ViS2l0V2ViSW5zcGVjdG9yKiB3ZWJJbnNwZWN0b3I7CisgICAgICAgIFdlYktpdFdl YldpbmRvd0ZlYXR1cmVzKiB3ZWJXaW5kb3dGZWF0dXJlczsKIAogICAgICAgICBXZWJLaXRXZWJG cmFtZSogbWFpbkZyYW1lOwotICAgICAgICBHUmVmUHRyPFdlYktpdFdlYkJhY2tGb3J3YXJkTGlz dD4gYmFja0ZvcndhcmRMaXN0OworICAgICAgICBXZWJLaXRXZWJCYWNrRm9yd2FyZExpc3QqIGJh Y2tGb3J3YXJkTGlzdDsKIAotICAgICAgICBHUmVmUHRyPEd0a01lbnU+IGN1cnJlbnRNZW51Owor ICAgICAgICBHdGtNZW51KiBjdXJyZW50TWVudTsKICAgICAgICAgZ2ludCBsYXN0UG9wdXBYUG9z aXRpb247CiAgICAgICAgIGdpbnQgbGFzdFBvcHVwWVBvc2l0aW9uOwogCiAgICAgICAgIEhhc2hT ZXQ8R3RrV2lkZ2V0Kj4gY2hpbGRyZW47CiAgICAgICAgIGJvb2wgZWRpdGFibGU7Ci0gICAgICAg IEdSZWZQdHI8R3RrSU1Db250ZXh0PiBpbUNvbnRleHQ7CisgICAgICAgIEd0a0lNQ29udGV4dCog aW1Db250ZXh0OwogCiAgICAgICAgIGdib29sZWFuIHRyYW5zcGFyZW50OwogCi0gICAgICAgIEdS ZWZQdHI8R3RrQWRqdXN0bWVudD4gaG9yaXpvbnRhbEFkanVzdG1lbnQ7Ci0gICAgICAgIEdSZWZQ dHI8R3RrQWRqdXN0bWVudD4gdmVydGljYWxBZGp1c3RtZW50OworICAgICAgICBHdGtBZGp1c3Rt ZW50KiBob3Jpem9udGFsQWRqdXN0bWVudDsKKyAgICAgICAgR3RrQWRqdXN0bWVudCogdmVydGlj YWxBZGp1c3RtZW50OwogCiAgICAgICAgIGdib29sZWFuIHpvb21GdWxsQ29udGVudDsKICAgICAg ICAgV2ViS2l0TG9hZFN0YXR1cyBsb2FkU3RhdHVzOwotICAgICAgICBHT3duUHRyPGNoYXI+IGVu Y29kaW5nOwotICAgICAgICBHT3duUHRyPGNoYXI+IGN1c3RvbUVuY29kaW5nOworICAgICAgICBj aGFyKiBlbmNvZGluZzsKKyAgICAgICAgY2hhciogY3VzdG9tRW5jb2Rpbmc7CiAKLSAgICAgICAg R093blB0cjxjaGFyPiBpY29uVVJJOworICAgICAgICBjaGFyKiBpY29uVVJJOwogCiAgICAgICAg IGdib29sZWFuIGRpc3Bvc2luZzsKICAgICAgICAgZ2Jvb2xlYW4gdXNlUHJpbWFyeUZvclBhc3Rl OwogCiAgICAgICAgIC8vIFRoZXNlIGFyZSBob3N0ZWQgaGVyZSBiZWNhdXNlIHRoZSBEYXRhU291 cmNlIG9iamVjdCBpcwogICAgICAgICAvLyBjcmVhdGVkIHRvbyBsYXRlIGluIHRoZSBmcmFtZSBs b2FkaW5nIHByb2Nlc3MuCi0gICAgICAgIEdSZWZQdHI8V2ViS2l0V2ViUmVzb3VyY2U+IG1haW5S ZXNvdXJjZTsKLSAgICAgICAgR093blB0cjxjaGFyPiBtYWluUmVzb3VyY2VJZGVudGlmaWVyOwot ICAgICAgICBHUmVmUHRyPEdIYXNoVGFibGU+IHN1YlJlc291cmNlczsKLSAgICAgICAgR093blB0 cjxjaGFyPiB0b29sdGlwVGV4dDsKKyAgICAgICAgV2ViS2l0V2ViUmVzb3VyY2UqIG1haW5SZXNv dXJjZTsKKyAgICAgICAgY2hhciogbWFpblJlc291cmNlSWRlbnRpZmllcjsKKyAgICAgICAgR0hh c2hUYWJsZSogc3ViUmVzb3VyY2VzOworICAgICAgICBjaGFyKiB0b29sdGlwVGV4dDsKIAogICAg ICAgICBIYXNoTWFwPEdka0RyYWdDb250ZXh0KiwgUmVmUHRyPFdlYkNvcmU6OkRhdGFPYmplY3RH dGs+ID4gZHJhZ2dpbmdEYXRhT2JqZWN0czsKICAgICB9OwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2 aWV3LmNwcAppbmRleCBjYTcyNjY1ZWQ4YTBmZjhhNDBlZTRjMzU3ZmNjMTBlNmJjZjVhZTMyLi4x MGEwODJjODk4NmI0ZmViNGVjMDA1MzU5NGQ4MTg1ZTVhNzkyNTU5IDEwMDY0NAotLS0gYS9XZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93 ZWJraXR3ZWJ2aWV3LmNwcApAQCAtMjA0LDcgKzIwNCw5IEBAIHN0YXRpYyB2b2lkIGRlc3Ryb3lf bWVudV9jYihHdGtPYmplY3QqIG9iamVjdCwgZ3BvaW50ZXIgZGF0YSkKIHsKICAgICBXZWJLaXRX ZWJWaWV3KiB3ZWJWaWV3ID0gV0VCS0lUX1dFQl9WSUVXKGRhdGEpOwogICAgIFdlYktpdFdlYlZp ZXdQcml2YXRlKiBwcml2ID0gV0VCS0lUX1dFQl9WSUVXX0dFVF9QUklWQVRFKHdlYlZpZXcpOwot ICAgIHByaXYtPmN1cnJlbnRNZW51ID0gMDsKKworICAgIGdfb2JqZWN0X3VucmVmKHByaXYtPmN1 cnJlbnRNZW51KTsKKyAgICBwcml2LT5jdXJyZW50TWVudSA9IE5VTEw7CiB9CiAKIHN0YXRpYyB2 b2lkIFBvcHVwTWVudVBvc2l0aW9uRnVuYyhHdGtNZW51KiBtZW51LCBnaW50ICp4LCBnaW50ICp5 LCBnYm9vbGVhbiAqcHVzaEluLCBncG9pbnRlciB1c2VyRGF0YSkKQEAgLTI5NCw3ICsyOTYsNyBA QCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X2ZvcndhcmRfY29udGV4dF9tZW51X2V2 ZW50KFdlYktpdFdlYlZpZXcqIHdlYlZpZQogICAgICAgICByZXR1cm4gRkFMU0U7CiAKICAgICBX ZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IFdFQktJVF9XRUJfVklFV19HRVRfUFJJVkFURSh3 ZWJWaWV3KTsKLSAgICBwcml2LT5jdXJyZW50TWVudSA9IG1lbnU7CisgICAgcHJpdi0+Y3VycmVu dE1lbnUgPSBHVEtfTUVOVShnX29iamVjdF9yZWYobWVudSkpOwogICAgIHByaXYtPmxhc3RQb3B1 cFhQb3NpdGlvbiA9IGV2ZW50Lmdsb2JhbFgoKTsKICAgICBwcml2LT5sYXN0UG9wdXBZUG9zaXRp b24gPSBldmVudC5nbG9iYWxZKCk7CiAKQEAgLTU2OCw3ICs1NzAsNyBAQCBzdGF0aWMgZ2Jvb2xl YW4gd2Via2l0X3dlYl92aWV3X2tleV9yZWxlYXNlX2V2ZW50KEd0a1dpZGdldCogd2lkZ2V0LCBH ZGtFdmVudEtleQogICAgIC8vIHRoZSBldmVudCBpZiB3ZSBkb24ndCBoYXZlIGEgcGVuZGluZyBj b21wb3NpdGlvbiwgYmVjYXVzZSB0aGF0IG1lYW5zIHdlCiAgICAgLy8gYXJlIHVzaW5nIGEgY29u dGV4dCBsaWtlICdzaW1wbGUnIHdoaWNoIG1hcmtzIGV2ZXJ5IGtleXN0cm9rZSBhcyBmaWx0ZXJl ZC4KICAgICBXZWJLaXQ6OkVkaXRvckNsaWVudCogY2xpZW50ID0gc3RhdGljX2Nhc3Q8V2ViS2l0 OjpFZGl0b3JDbGllbnQqPihjb3JlKHdlYlZpZXcpLT5lZGl0b3JDbGllbnQoKSk7Ci0gICAgaWYg KGd0a19pbV9jb250ZXh0X2ZpbHRlcl9rZXlwcmVzcyh3ZWJWaWV3LT5wcml2LT5pbUNvbnRleHQu Z2V0KCksIGV2ZW50KSAmJiAhY2xpZW50LT5oYXNQZW5kaW5nQ29tcG9zaXRpb24oKSkKKyAgICBp ZiAoZ3RrX2ltX2NvbnRleHRfZmlsdGVyX2tleXByZXNzKHdlYlZpZXctPnByaXYtPmltQ29udGV4 dCwgZXZlbnQpICYmICFjbGllbnQtPmhhc1BlbmRpbmdDb21wb3NpdGlvbigpKQogICAgICAgICBy ZXR1cm4gVFJVRTsKIAogICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUod2ViVmlldyktPmZvY3VzQ29u dHJvbGxlcigpLT5mb2N1c2VkT3JNYWluRnJhbWUoKTsKQEAgLTYyNSw3ICs2MjcsNyBAQCBzdGF0 aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X2J1dHRvbl9yZWxlYXNlX2V2ZW50KEd0a1dpZGdl dCogd2lkZ2V0LCBHZGtFdmVudAogICAgIGlmIChmb2N1c2VkRnJhbWUgJiYgZm9jdXNlZEZyYW1l LT5lZGl0b3IoKS0+Y2FuRWRpdCgpKSB7CiAjaWZkZWYgTUFFTU9fQ0hBTkdFUwogICAgICAgICBX ZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IHdlYlZpZXctPnByaXY7Ci0gICAgICAgIGhpbGRv bl9ndGtfaW1fY29udGV4dF9maWx0ZXJfZXZlbnQocHJpdi0+aW1Db250ZXh0LmdldCgpLCAoR2Rr RXZlbnQqKWV2ZW50KTsKKyAgICAgICAgaGlsZG9uX2d0a19pbV9jb250ZXh0X2ZpbHRlcl9ldmVu dChwcml2LT5pbUNvbnRleHQsIChHZGtFdmVudCopZXZlbnQpOwogI2VuZGlmCiAgICAgfQogCkBA IC03MjgsNyArNzMwLDcgQEAgc3RhdGljIGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19mb2N1c19p bl9ldmVudChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRGb2N1cyoKICAgICAgICAgZWxzZQog ICAgICAgICAgICAgZm9jdXNDb250cm9sbGVyLT5zZXRGb2N1c2VkRnJhbWUoY29yZSh3ZWJWaWV3 KS0+bWFpbkZyYW1lKCkpOwogCi0gICAgICAgIGd0a19pbV9jb250ZXh0X2ZvY3VzX2luKHdlYlZp ZXctPnByaXYtPmltQ29udGV4dC5nZXQoKSk7CisgICAgICAgIGd0a19pbV9jb250ZXh0X2ZvY3Vz X2luKHdlYlZpZXctPnByaXYtPmltQ29udGV4dCk7CiAgICAgfQogICAgIHJldHVybiBHVEtfV0lE R0VUX0NMQVNTKHdlYmtpdF93ZWJfdmlld19wYXJlbnRfY2xhc3MpLT5mb2N1c19pbl9ldmVudCh3 aWRnZXQsIGV2ZW50KTsKIH0KQEAgLTc0Niw3ICs3NDgsNyBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Vi a2l0X3dlYl92aWV3X2ZvY3VzX291dF9ldmVudChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRG b2N1cwogICAgIH0KIAogICAgIGlmICh3ZWJWaWV3LT5wcml2LT5pbUNvbnRleHQpCi0gICAgICAg IGd0a19pbV9jb250ZXh0X2ZvY3VzX291dCh3ZWJWaWV3LT5wcml2LT5pbUNvbnRleHQuZ2V0KCkp OworICAgICAgICBndGtfaW1fY29udGV4dF9mb2N1c19vdXQod2ViVmlldy0+cHJpdi0+aW1Db250 ZXh0KTsKIAogICAgIHJldHVybiBHVEtfV0lER0VUX0NMQVNTKHdlYmtpdF93ZWJfdmlld19wYXJl bnRfY2xhc3MpLT5mb2N1c19vdXRfZXZlbnQod2lkZ2V0LCBldmVudCk7CiB9CkBAIC03ODUsNyAr Nzg3LDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X3JlYWxpemUoR3RrV2lkZ2V0KiB3 aWRnZXQpCiAKICAgICBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3ID0gV0VCS0lUX1dFQl9WSUVXKHdp ZGdldCk7CiAgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2Owot ICAgIGd0a19pbV9jb250ZXh0X3NldF9jbGllbnRfd2luZG93KHByaXYtPmltQ29udGV4dC5nZXQo KSwgd2lkZ2V0LT53aW5kb3cpOworICAgIGd0a19pbV9jb250ZXh0X3NldF9jbGllbnRfd2luZG93 KHByaXYtPmltQ29udGV4dCwgd2lkZ2V0LT53aW5kb3cpOwogfQogCiBzdGF0aWMgdm9pZCB3ZWJr aXRfd2ViX3ZpZXdfc2V0X3Njcm9sbF9hZGp1c3RtZW50cyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3 LCBHdGtBZGp1c3RtZW50KiBoYWRqLCBHdGtBZGp1c3RtZW50KiB2YWRqKQpAQCAtNzk0LDcgKzc5 NiwxOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfc2V0X3Njcm9sbF9hZGp1c3RtZW50 cyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBHdGtBZAogICAgICAgICByZXR1cm47CiAKICAgICBG cmFtZVZpZXcqIHZpZXcgPSBjb3JlKHdlYmtpdF93ZWJfdmlld19nZXRfbWFpbl9mcmFtZSh3ZWJW aWV3KSktPnZpZXcoKTsKKworICAgIGlmIChoYWRqKQorICAgICAgICBnX29iamVjdF9yZWYoaGFk aik7CisgICAgaWYgKHZhZGopCisgICAgICAgIGdfb2JqZWN0X3JlZih2YWRqKTsKKwogICAgIFdl YktpdFdlYlZpZXdQcml2YXRlKiBwcml2ID0gd2ViVmlldy0+cHJpdjsKKworICAgIGlmIChwcml2 LT5ob3Jpem9udGFsQWRqdXN0bWVudCkKKyAgICAgICAgZ19vYmplY3RfdW5yZWYocHJpdi0+aG9y aXpvbnRhbEFkanVzdG1lbnQpOworICAgIGlmIChwcml2LT52ZXJ0aWNhbEFkanVzdG1lbnQpCisg ICAgICAgIGdfb2JqZWN0X3VucmVmKHByaXYtPnZlcnRpY2FsQWRqdXN0bWVudCk7CisKICAgICBw cml2LT5ob3Jpem9udGFsQWRqdXN0bWVudCA9IGhhZGo7CiAgICAgcHJpdi0+dmVydGljYWxBZGp1 c3RtZW50ID0gdmFkajsKIApAQCAtMTA2Miw2ICsxMDc2LDIxIEBAIHN0YXRpYyB2b2lkIHdlYmtp dF93ZWJfdmlld19kaXNwb3NlKEdPYmplY3QqIG9iamVjdCkKIAogICAgIHByaXYtPmRpc3Bvc2lu ZyA9IFRSVUU7CiAKKyAgICBpZiAocHJpdi0+aG9yaXpvbnRhbEFkanVzdG1lbnQpIHsKKyAgICAg ICAgZ19vYmplY3RfdW5yZWYocHJpdi0+aG9yaXpvbnRhbEFkanVzdG1lbnQpOworICAgICAgICBw cml2LT5ob3Jpem9udGFsQWRqdXN0bWVudCA9IE5VTEw7CisgICAgfQorCisgICAgaWYgKHByaXYt PnZlcnRpY2FsQWRqdXN0bWVudCkgeworICAgICAgICBnX29iamVjdF91bnJlZihwcml2LT52ZXJ0 aWNhbEFkanVzdG1lbnQpOworICAgICAgICBwcml2LT52ZXJ0aWNhbEFkanVzdG1lbnQgPSBOVUxM OworICAgIH0KKworICAgIGlmIChwcml2LT5iYWNrRm9yd2FyZExpc3QpIHsKKyAgICAgICAgZ19v YmplY3RfdW5yZWYocHJpdi0+YmFja0ZvcndhcmRMaXN0KTsKKyAgICAgICAgcHJpdi0+YmFja0Zv cndhcmRMaXN0ID0gTlVMTDsKKyAgICB9CisKICAgICBpZiAocHJpdi0+Y29yZVBhZ2UpIHsKICAg ICAgICAgd2Via2l0X3dlYl92aWV3X3N0b3BfbG9hZGluZyhXRUJLSVRfV0VCX1ZJRVcob2JqZWN0 KSk7CiAKQEAgLTEwNzEsMTggKzExMDAsMzAgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3 X2Rpc3Bvc2UoR09iamVjdCogb2JqZWN0KQogICAgIH0KIAogICAgIGlmIChwcml2LT53ZWJTZXR0 aW5ncykgewotICAgICAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X2J5X2Z1bmMocHJp di0+d2ViU2V0dGluZ3MuZ2V0KCksIChncG9pbnRlcil3ZWJraXRfd2ViX3ZpZXdfc2V0dGluZ3Nf bm90aWZ5LCB3ZWJWaWV3KTsKLSAgICAgICAgcHJpdi0+d2ViU2V0dGluZ3MuY2xlYXIoKTsKKyAg ICAgICAgZ19zaWduYWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9mdW5jKHByaXYtPndlYlNldHRp bmdzLCAoZ3BvaW50ZXIpd2Via2l0X3dlYl92aWV3X3NldHRpbmdzX25vdGlmeSwgd2ViVmlldyk7 CisgICAgICAgIGdfb2JqZWN0X3VucmVmKHByaXYtPndlYlNldHRpbmdzKTsKKyAgICAgICAgcHJp di0+d2ViU2V0dGluZ3MgPSBOVUxMOworCisgICAgICAgIGdfb2JqZWN0X3VucmVmKHByaXYtPndl Ykluc3BlY3Rvcik7CisgICAgICAgIHByaXYtPndlYkluc3BlY3RvciA9IE5VTEw7CisKKyAgICAg ICAgZ19vYmplY3RfdW5yZWYocHJpdi0+d2ViV2luZG93RmVhdHVyZXMpOworICAgICAgICBwcml2 LT53ZWJXaW5kb3dGZWF0dXJlcyA9IE5VTEw7CisKKyAgICAgICAgZ19vYmplY3RfdW5yZWYocHJp di0+aW1Db250ZXh0KTsKKyAgICAgICAgcHJpdi0+aW1Db250ZXh0ID0gTlVMTDsKKyAgICB9CisK KyAgICBpZiAocHJpdi0+bWFpblJlc291cmNlKSB7CisgICAgICAgIGdfb2JqZWN0X3VucmVmKHBy aXYtPm1haW5SZXNvdXJjZSk7CisgICAgICAgIHByaXYtPm1haW5SZXNvdXJjZSA9IE5VTEw7Cisg ICAgfQorCisgICAgaWYgKHByaXYtPnN1YlJlc291cmNlcykgeworICAgICAgICBnX2hhc2hfdGFi bGVfdW5yZWYocHJpdi0+c3ViUmVzb3VyY2VzKTsKKyAgICAgICAgcHJpdi0+c3ViUmVzb3VyY2Vz ID0gTlVMTDsKICAgICB9CiAKLSAgICBwcml2LT5ob3Jpem9udGFsQWRqdXN0bWVudC5jbGVhcigp OwotICAgIHByaXYtPnZlcnRpY2FsQWRqdXN0bWVudC5jbGVhcigpOwotICAgIHByaXYtPmJhY2tG b3J3YXJkTGlzdC5jbGVhcigpOwotICAgIHByaXYtPndlYkluc3BlY3Rvci5jbGVhcigpOwotICAg IHByaXYtPndlYldpbmRvd0ZlYXR1cmVzLmNsZWFyKCk7Ci0gICAgcHJpdi0+aW1Db250ZXh0LmNs ZWFyKCk7Ci0gICAgcHJpdi0+bWFpblJlc291cmNlLmNsZWFyKCk7Ci0gICAgcHJpdi0+c3ViUmVz b3VyY2VzLmNsZWFyKCk7CiAgICAgcHJpdi0+ZHJhZ2dpbmdEYXRhT2JqZWN0cy5jbGVhcigpOwog CiAgICAgR19PQkpFQ1RfQ0xBU1Mod2Via2l0X3dlYl92aWV3X3BhcmVudF9jbGFzcyktPmRpc3Bv c2Uob2JqZWN0KTsKQEAgLTEwOTMsMTEgKzExMzQsMTEgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dl Yl92aWV3X2ZpbmFsaXplKEdPYmplY3QqIG9iamVjdCkKICAgICBXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3ID0gV0VCS0lUX1dFQl9WSUVXKG9iamVjdCk7CiAgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUq IHByaXYgPSB3ZWJWaWV3LT5wcml2OwogCi0gICAgcHJpdi0+dG9vbHRpcFRleHQuY2xlYXIoKTsK LSAgICBwcml2LT5tYWluUmVzb3VyY2VJZGVudGlmaWVyLmNsZWFyKCk7Ci0gICAgcHJpdi0+ZW5j b2RpbmcuY2xlYXIoKTsKLSAgICBwcml2LT5jdXN0b21FbmNvZGluZy5jbGVhcigpOwotICAgIHBy aXYtPmljb25VUkkuY2xlYXIoKTsKKyAgICBnX2ZyZWUocHJpdi0+dG9vbHRpcFRleHQpOworICAg IGdfZnJlZShwcml2LT5tYWluUmVzb3VyY2VJZGVudGlmaWVyKTsKKyAgICBnX2ZyZWUocHJpdi0+ ZW5jb2RpbmcpOworICAgIGdfZnJlZShwcml2LT5jdXN0b21FbmNvZGluZyk7CisgICAgZ19mcmVl KHByaXYtPmljb25VUkkpOwogCiAgICAgR19PQkpFQ1RfQ0xBU1Mod2Via2l0X3dlYl92aWV3X3Bh cmVudF9jbGFzcyktPmZpbmFsaXplKG9iamVjdCk7CiB9CkBAIC0xMTQ4LDcgKzExODksNyBAQCBz dGF0aWMgQXRrT2JqZWN0KiB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2FjY2Vzc2libGUoR3RrV2lkZ2V0 KiB3aWRnZXQpCiBzdGF0aWMgZ2RvdWJsZSB3ZWJWaWV3R2V0RFBJKFdlYktpdFdlYlZpZXcqIHdl YlZpZXcpCiB7CiAgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2 OwotICAgIFdlYktpdFdlYlNldHRpbmdzKiB3ZWJTZXR0aW5ncyA9IHByaXYtPndlYlNldHRpbmdz LmdldCgpOworICAgIFdlYktpdFdlYlNldHRpbmdzKiB3ZWJTZXR0aW5ncyA9IHByaXYtPndlYlNl dHRpbmdzOwogICAgIGdib29sZWFuIGVuZm9yY2U5NkRQSTsKICAgICBnX29iamVjdF9nZXQod2Vi U2V0dGluZ3MsICJlbmZvcmNlLTk2LWRwaSIsICZlbmZvcmNlOTZEUEksIE5VTEwpOwogICAgIGlm IChlbmZvcmNlOTZEUEkpCkBAIC0xMTc0LDcgKzEyMTUsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRf d2ViX3ZpZXdfc2NyZWVuX2NoYW5nZWQoR3RrV2lkZ2V0KiB3aWRnZXQsIEdka1NjcmVlbiogcHJl dmlvdQogICAgIGlmIChwcml2LT5kaXNwb3NpbmcpCiAgICAgICAgIHJldHVybjsKIAotICAgIFdl YktpdFdlYlNldHRpbmdzKiB3ZWJTZXR0aW5ncyA9IHByaXYtPndlYlNldHRpbmdzLmdldCgpOwor ICAgIFdlYktpdFdlYlNldHRpbmdzKiB3ZWJTZXR0aW5ncyA9IHByaXYtPndlYlNldHRpbmdzOwog ICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IGNvcmUod2ViVmlldyktPnNldHRpbmdzKCk7CiAgICAg Z2RvdWJsZSBEUEkgPSB3ZWJWaWV3R2V0RFBJKHdlYlZpZXcpOwogCkBAIC0xMjIzLDcgKzEyNjQs NyBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X3F1ZXJ5X3Rvb2x0aXAoR3RrV2lk Z2V0ICp3aWRnZXQsIGdpbnQgeCwgZ2ludCB5LAogICAgIFdlYktpdFdlYlZpZXdQcml2YXRlKiBw cml2ID0gV0VCS0lUX1dFQl9WSUVXX0dFVF9QUklWQVRFKHdpZGdldCk7CiAKICAgICBpZiAocHJp di0+dG9vbHRpcFRleHQpIHsKLSAgICAgICAgZ3RrX3Rvb2x0aXBfc2V0X3RleHQodG9vbHRpcCwg cHJpdi0+dG9vbHRpcFRleHQuZ2V0KCkpOworICAgICAgICBndGtfdG9vbHRpcF9zZXRfdGV4dCh0 b29sdGlwLCBwcml2LT50b29sdGlwVGV4dCk7CiAgICAgICAgIHJldHVybiBUUlVFOwogICAgIH0K IApAQCAtMTIzNCw3ICsxMjc1LDcgQEAgc3RhdGljIGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19x dWVyeV90b29sdGlwKEd0a1dpZGdldCAqd2lkZ2V0LCBnaW50IHgsIGdpbnQgeSwKIHN0YXRpYyBH dGtJTUNvbnRleHQqIHdlYmtpdF93ZWJfdmlld19nZXRfaW1fY29udGV4dChXZWJLaXRXZWJWaWV3 KiB3ZWJWaWV3KQogewogICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklF Vyh3ZWJWaWV3KSwgMCk7Ci0gICAgcmV0dXJuIEdUS19JTV9DT05URVhUKHdlYlZpZXctPnByaXYt PmltQ29udGV4dC5nZXQoKSk7CisgICAgcmV0dXJuIEdUS19JTV9DT05URVhUKHdlYlZpZXctPnBy aXYtPmltQ29udGV4dCk7CiB9CiAKIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19jbGFzc19p bml0KFdlYktpdFdlYlZpZXdDbGFzcyogd2ViVmlld0NsYXNzKQpAQCAtMjU1MCw3ICsyNTkxLDcg QEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2NsYXNzX2luaXQoV2ViS2l0V2ViVmlld0Ns YXNzKiB3ZWJWaWV3Q2xhc3MpCiBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfdXBkYXRlX3Nl dHRpbmdzKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiB7CiAgICAgV2ViS2l0V2ViVmlld1ByaXZh dGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2OwotICAgIFdlYktpdFdlYlNldHRpbmdzKiB3ZWJTZXR0 aW5ncyA9IHByaXYtPndlYlNldHRpbmdzLmdldCgpOworICAgIFdlYktpdFdlYlNldHRpbmdzKiB3 ZWJTZXR0aW5ncyA9IHByaXYtPndlYlNldHRpbmdzOwogICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9 IGNvcmUod2ViVmlldyktPnNldHRpbmdzKCk7CiAKICAgICBnY2hhciogZGVmYXVsdEVuY29kaW5n LCAqY3Vyc2l2ZUZvbnRGYW1pbHksICpkZWZhdWx0Rm9udEZhbWlseSwgKmZhbnRhc3lGb250RmFt aWx5LCAqbW9ub3NwYWNlRm9udEZhbWlseSwgKnNhbnNTZXJpZkZvbnRGYW1pbHksICpzZXJpZkZv bnRGYW1pbHksICp1c2VyU3R5bGVzaGVldFVyaTsKQEAgLTI3NTQsMzYgKzI3OTUsNDAgQEAgc3Rh dGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2luaXQoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAg ICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IFdFQktJVF9XRUJfVklFV19HRVRfUFJJVkFU RSh3ZWJWaWV3KTsKICAgICB3ZWJWaWV3LT5wcml2ID0gcHJpdjsKIAotICAgIHByaXYtPmltQ29u dGV4dCA9IGFkb3B0R1JlZihndGtfaW1fbXVsdGljb250ZXh0X25ldygpKTsKKyAgICBwcml2LT5p bUNvbnRleHQgPSBndGtfaW1fbXVsdGljb250ZXh0X25ldygpOwogCiAgICAgV2ViS2l0OjpJbnNw ZWN0b3JDbGllbnQqIGluc3BlY3RvckNsaWVudCA9IG5ldyBXZWJLaXQ6Okluc3BlY3RvckNsaWVu dCh3ZWJWaWV3KTsKICAgICBwcml2LT5jb3JlUGFnZSA9IG5ldyBQYWdlKG5ldyBXZWJLaXQ6OkNo cm9tZUNsaWVudCh3ZWJWaWV3KSwgbmV3IFdlYktpdDo6Q29udGV4dE1lbnVDbGllbnQod2ViVmll dyksIG5ldyBXZWJLaXQ6OkVkaXRvckNsaWVudCh3ZWJWaWV3KSwgbmV3IFdlYktpdDo6RHJhZ0Ns aWVudCh3ZWJWaWV3KSwgaW5zcGVjdG9yQ2xpZW50LCAwLCAwKTsKIAogICAgIC8vIFdlIGFsc28g YWRkIGEgc2ltcGxlIHdyYXBwZXIgY2xhc3MgdG8gcHJvdmlkZSB0aGUgcHVibGljCiAgICAgLy8g aW50ZXJmYWNlIGZvciB0aGUgV2ViIEluc3BlY3Rvci4KLSAgICBwcml2LT53ZWJJbnNwZWN0b3Ig PSBhZG9wdEdSZWYoV0VCS0lUX1dFQl9JTlNQRUNUT1IoZ19vYmplY3RfbmV3KFdFQktJVF9UWVBF X1dFQl9JTlNQRUNUT1IsIE5VTEwpKSk7Ci0gICAgd2Via2l0X3dlYl9pbnNwZWN0b3Jfc2V0X2lu c3BlY3Rvcl9jbGllbnQocHJpdi0+d2ViSW5zcGVjdG9yLmdldCgpLCBwcml2LT5jb3JlUGFnZSk7 CisgICAgcHJpdi0+d2ViSW5zcGVjdG9yID0gV0VCS0lUX1dFQl9JTlNQRUNUT1IoZ19vYmplY3Rf bmV3KFdFQktJVF9UWVBFX1dFQl9JTlNQRUNUT1IsIE5VTEwpKTsKKyAgICB3ZWJraXRfd2ViX2lu c3BlY3Rvcl9zZXRfaW5zcGVjdG9yX2NsaWVudChwcml2LT53ZWJJbnNwZWN0b3IsIHByaXYtPmNv cmVQYWdlKTsKIAotICAgIC8vIFRoZXNlIGFyZSBjcmVhdGUgd2l0aCBmbG9hdGluZyByZWZlcmVu Y2VzLCBzbyB0aGV5IHNob3VsZCBub3QgYmUgd3JhcHBlZCBpbiBhZG9wdEdyZWYuCiAgICAgcHJp di0+aG9yaXpvbnRhbEFkanVzdG1lbnQgPSBHVEtfQURKVVNUTUVOVChndGtfYWRqdXN0bWVudF9u ZXcoMC4wLCAwLjAsIDAuMCwgMC4wLCAwLjAsIDAuMCkpOwogICAgIHByaXYtPnZlcnRpY2FsQWRq dXN0bWVudCA9IEdUS19BREpVU1RNRU5UKGd0a19hZGp1c3RtZW50X25ldygwLjAsIDAuMCwgMC4w LCAwLjAsIDAuMCwgMC4wKSk7CiAKKyAgICBnX29iamVjdF9yZWZfc2luayhwcml2LT5ob3Jpem9u dGFsQWRqdXN0bWVudCk7CisgICAgZ19vYmplY3RfcmVmX3NpbmsocHJpdi0+dmVydGljYWxBZGp1 c3RtZW50KTsKKwogICAgIEdUS19XSURHRVRfU0VUX0ZMQUdTKHdlYlZpZXcsIEdUS19DQU5fRk9D VVMpOwogICAgIHByaXYtPm1haW5GcmFtZSA9IFdFQktJVF9XRUJfRlJBTUUod2Via2l0X3dlYl9m cmFtZV9uZXcod2ViVmlldykpOwogICAgIHByaXYtPmxhc3RQb3B1cFhQb3NpdGlvbiA9IHByaXYt Pmxhc3RQb3B1cFlQb3NpdGlvbiA9IC0xOwogICAgIHByaXYtPmVkaXRhYmxlID0gZmFsc2U7CiAK LSAgICBwcml2LT5iYWNrRm9yd2FyZExpc3QgPSBhZG9wdEdSZWYod2Via2l0X3dlYl9iYWNrX2Zv cndhcmRfbGlzdF9uZXdfd2l0aF93ZWJfdmlldyh3ZWJWaWV3KSk7CisgICAgcHJpdi0+YmFja0Zv cndhcmRMaXN0ID0gd2Via2l0X3dlYl9iYWNrX2ZvcndhcmRfbGlzdF9uZXdfd2l0aF93ZWJfdmll dyh3ZWJWaWV3KTsKIAogICAgIHByaXYtPnpvb21GdWxsQ29udGVudCA9IEZBTFNFOwogCi0gICAg cHJpdi0+d2ViU2V0dGluZ3MgPSBhZG9wdEdSZWYod2Via2l0X3dlYl9zZXR0aW5nc19uZXcoKSk7 CisgICAgcHJpdi0+d2ViU2V0dGluZ3MgPSB3ZWJraXRfd2ViX3NldHRpbmdzX25ldygpOwogICAg IHdlYmtpdF93ZWJfdmlld191cGRhdGVfc2V0dGluZ3Mod2ViVmlldyk7Ci0gICAgZ19zaWduYWxf Y29ubmVjdChwcml2LT53ZWJTZXR0aW5ncy5nZXQoKSwgIm5vdGlmeSIsIEdfQ0FMTEJBQ0sod2Vi a2l0X3dlYl92aWV3X3NldHRpbmdzX25vdGlmeSksIHdlYlZpZXcpOworICAgIGdfc2lnbmFsX2Nv bm5lY3QocHJpdi0+d2ViU2V0dGluZ3MsICJub3RpZnkiLCBHX0NBTExCQUNLKHdlYmtpdF93ZWJf dmlld19zZXR0aW5nc19ub3RpZnkpLCB3ZWJWaWV3KTsKKworICAgIHByaXYtPndlYldpbmRvd0Zl YXR1cmVzID0gd2Via2l0X3dlYl93aW5kb3dfZmVhdHVyZXNfbmV3KCk7CiAKLSAgICBwcml2LT53 ZWJXaW5kb3dGZWF0dXJlcyA9IGFkb3B0R1JlZih3ZWJraXRfd2ViX3dpbmRvd19mZWF0dXJlc19u ZXcoKSk7CisgICAgcHJpdi0+c3ViUmVzb3VyY2VzID0gZ19oYXNoX3RhYmxlX25ld19mdWxsKGdf c3RyX2hhc2gsIGdfc3RyX2VxdWFsLCBnX2ZyZWUsIGdfb2JqZWN0X3VucmVmKTsKIAotICAgIHBy aXYtPnN1YlJlc291cmNlcyA9IGFkb3B0R1JlZihnX2hhc2hfdGFibGVfbmV3X2Z1bGwoZ19zdHJf aGFzaCwgZ19zdHJfZXF1YWwsIGdfZnJlZSwgZ19vYmplY3RfdW5yZWYpKTsKKyAgICBwcml2LT50 b29sdGlwVGV4dCA9IDA7CiB9CiAKIEd0a1dpZGdldCogd2Via2l0X3dlYl92aWV3X25ldyh2b2lk KQpAQCAtMjgzOSw3ICsyODg0LDkgQEAgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfc2V0X3NldHRpbmdz KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIFdlYktpdFdlYlNldHRpbmdzKiB3ZWIKICAgICBnX3Jl dHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJfU0VUVElOR1Mod2ViU2V0dGluZ3MpKTsKIAogICAg IFdlYktpdFdlYlZpZXdQcml2YXRlKiBwcml2ID0gd2ViVmlldy0+cHJpdjsKLSAgICBnX3NpZ25h bF9oYW5kbGVyc19kaXNjb25uZWN0X2J5X2Z1bmMocHJpdi0+d2ViU2V0dGluZ3MuZ2V0KCksIChn cG9pbnRlcil3ZWJraXRfd2ViX3ZpZXdfc2V0dGluZ3Nfbm90aWZ5LCB3ZWJWaWV3KTsKKyAgICBn X3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X2J5X2Z1bmMocHJpdi0+d2ViU2V0dGluZ3MsIChn cG9pbnRlcil3ZWJraXRfd2ViX3ZpZXdfc2V0dGluZ3Nfbm90aWZ5LCB3ZWJWaWV3KTsKKyAgICBn X29iamVjdF91bnJlZihwcml2LT53ZWJTZXR0aW5ncyk7CisgICAgZ19vYmplY3RfcmVmKHdlYlNl dHRpbmdzKTsKICAgICBwcml2LT53ZWJTZXR0aW5ncyA9IHdlYlNldHRpbmdzOwogICAgIHdlYmtp dF93ZWJfdmlld191cGRhdGVfc2V0dGluZ3Mod2ViVmlldyk7CiAgICAgZ19zaWduYWxfY29ubmVj dCh3ZWJTZXR0aW5ncywgIm5vdGlmeSIsIEdfQ0FMTEJBQ0sod2Via2l0X3dlYl92aWV3X3NldHRp bmdzX25vdGlmeSksIHdlYlZpZXcpOwpAQCAtMjg1MSw3ICsyODk4LDcgQEAgV2ViS2l0V2ViU2V0 dGluZ3MqIHdlYmtpdF93ZWJfdmlld19nZXRfc2V0dGluZ3MoV2ViS2l0V2ViVmlldyogd2ViVmll dykKICAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldyks IE5VTEwpOwogCiAgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2 OwotICAgIHJldHVybiBwcml2LT53ZWJTZXR0aW5ncy5nZXQoKTsKKyAgICByZXR1cm4gcHJpdi0+ d2ViU2V0dGluZ3M7CiB9CiAKIC8qKgpAQCAtMjg3NSw3ICsyOTIyLDcgQEAgV2ViS2l0V2ViSW5z cGVjdG9yKiB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2luc3BlY3RvcihXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3KQogICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3 KSwgTlVMTCk7CiAKICAgICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IHdlYlZpZXctPnBy aXY7Ci0gICAgcmV0dXJuIHByaXYtPndlYkluc3BlY3Rvci5nZXQoKTsKKyAgICByZXR1cm4gcHJp di0+d2ViSW5zcGVjdG9yOwogfQogCiAvLyBpbnRlcm5hbApAQCAtMjg4Niw5ICsyOTMzLDExIEBA IHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19zZXRfd2luZG93X2ZlYXR1cmVzKFdlYktpdFdl YlZpZXcqIHdlYlZpZXcsIFdlYktpdFdlCiAgICAgaWYgKCF3ZWJXaW5kb3dGZWF0dXJlcykKICAg ICAgIHJldHVybjsKIAotICAgIGlmICh3ZWJraXRfd2ViX3dpbmRvd19mZWF0dXJlc19lcXVhbChw cml2LT53ZWJXaW5kb3dGZWF0dXJlcy5nZXQoKSwgd2ViV2luZG93RmVhdHVyZXMpKQorICAgIGlm ICh3ZWJraXRfd2ViX3dpbmRvd19mZWF0dXJlc19lcXVhbChwcml2LT53ZWJXaW5kb3dGZWF0dXJl cywgd2ViV2luZG93RmVhdHVyZXMpKQogICAgICAgcmV0dXJuOwogCisgICAgZ19vYmplY3RfdW5y ZWYocHJpdi0+d2ViV2luZG93RmVhdHVyZXMpOworICAgIGdfb2JqZWN0X3JlZih3ZWJXaW5kb3dG ZWF0dXJlcyk7CiAgICAgcHJpdi0+d2ViV2luZG93RmVhdHVyZXMgPSB3ZWJXaW5kb3dGZWF0dXJl czsKIH0KIApAQCAtMjkwOCw3ICsyOTU3LDcgQEAgV2ViS2l0V2ViV2luZG93RmVhdHVyZXMqIHdl YmtpdF93ZWJfdmlld19nZXRfd2luZG93X2ZlYXR1cmVzKFdlYktpdFdlYlZpZXcqIHdlYlYKICAg ICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldyksIE5VTEwp OwogCiAgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2OwotICAg IHJldHVybiBwcml2LT53ZWJXaW5kb3dGZWF0dXJlcy5nZXQoKTsKKyAgICByZXR1cm4gcHJpdi0+ d2ViV2luZG93RmVhdHVyZXM7CiB9CiAKIC8qKgpAQCAtMjk3OCw3ICszMDI3LDcgQEAgV2ViS2l0 V2ViQmFja0ZvcndhcmRMaXN0KiB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2JhY2tfZm9yd2FyZF9saXN0 KFdlYktpdFdlYlZpZXcqIHcKICAgICBpZiAoIWNvcmUod2ViVmlldykgfHwgIWNvcmUod2ViVmll dyktPmJhY2tGb3J3YXJkTGlzdCgpLT5lbmFibGVkKCkpCiAgICAgICAgIHJldHVybiBOVUxMOwog Ci0gICAgcmV0dXJuIHByaXYtPmJhY2tGb3J3YXJkTGlzdC5nZXQoKTsKKyAgICByZXR1cm4gcHJp di0+YmFja0ZvcndhcmRMaXN0OwogfQogCiAvKioKQEAgLTM3MzgsNyArMzc4Nyw3IEBAIHZvaWQg d2Via2l0X3dlYl92aWV3X3pvb21faW4oV2ViS2l0V2ViVmlldyogd2ViVmlldykKIAogICAgIFdl YktpdFdlYlZpZXdQcml2YXRlKiBwcml2ID0gd2ViVmlldy0+cHJpdjsKICAgICBnZmxvYXQgem9v bU11bHRpcGxpZXJSYXRpbzsKLSAgICBnX29iamVjdF9nZXQocHJpdi0+d2ViU2V0dGluZ3MuZ2V0 KCksICJ6b29tLXN0ZXAiLCAmem9vbU11bHRpcGxpZXJSYXRpbywgTlVMTCk7CisgICAgZ19vYmpl Y3RfZ2V0KHByaXYtPndlYlNldHRpbmdzLCAiem9vbS1zdGVwIiwgJnpvb21NdWx0aXBsaWVyUmF0 aW8sIE5VTEwpOwogCiAgICAgd2Via2l0X3dlYl92aWV3X3NldF96b29tX2xldmVsKHdlYlZpZXcs IHdlYmtpdF93ZWJfdmlld19nZXRfem9vbV9sZXZlbCh3ZWJWaWV3KSArIHpvb21NdWx0aXBsaWVy UmF0aW8pOwogfQpAQCAtMzc1OSw3ICszODA4LDcgQEAgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfem9v bV9vdXQoV2ViS2l0V2ViVmlldyogd2ViVmlldykKIAogICAgIFdlYktpdFdlYlZpZXdQcml2YXRl KiBwcml2ID0gd2ViVmlldy0+cHJpdjsKICAgICBnZmxvYXQgem9vbU11bHRpcGxpZXJSYXRpbzsK LSAgICBnX29iamVjdF9nZXQocHJpdi0+d2ViU2V0dGluZ3MuZ2V0KCksICJ6b29tLXN0ZXAiLCAm em9vbU11bHRpcGxpZXJSYXRpbywgTlVMTCk7CisgICAgZ19vYmplY3RfZ2V0KHByaXYtPndlYlNl dHRpbmdzLCAiem9vbS1zdGVwIiwgJnpvb21NdWx0aXBsaWVyUmF0aW8sIE5VTEwpOwogCiAgICAg d2Via2l0X3dlYl92aWV3X3NldF96b29tX2xldmVsKHdlYlZpZXcsIHdlYmtpdF93ZWJfdmlld19n ZXRfem9vbV9sZXZlbCh3ZWJWaWV3KSAtIHpvb21NdWx0aXBsaWVyUmF0aW8pOwogfQpAQCAtMzg3 NCw4ICszOTIzLDkgQEAgY29uc3QgZ2NoYXIqIHdlYmtpdF93ZWJfdmlld19nZXRfZW5jb2Rpbmco V2ViS2l0V2ViVmlldyogd2ViVmlldykKIAogICAgIGlmICghZW5jb2RpbmcuaXNFbXB0eSgpKSB7 CiAgICAgICAgIFdlYktpdFdlYlZpZXdQcml2YXRlKiBwcml2ID0gd2ViVmlldy0+cHJpdjsKLSAg ICAgICAgcHJpdi0+ZW5jb2Rpbmcuc2V0KGdfc3RyZHVwKGVuY29kaW5nLnV0ZjgoKS5kYXRhKCkp KTsKLSAgICAgICAgcmV0dXJuIHByaXYtPmVuY29kaW5nLmdldCgpOworICAgICAgICBnX2ZyZWUo cHJpdi0+ZW5jb2RpbmcpOworICAgICAgICBwcml2LT5lbmNvZGluZyA9IGdfc3RyZHVwKGVuY29k aW5nLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICByZXR1cm4gcHJpdi0+ZW5jb2Rpbmc7CiAgICAg fSBlbHNlCiAgICAgICByZXR1cm4gTlVMTDsKIH0KQEAgLTM5MTYsOCArMzk2Niw5IEBAIGNvbnN0 IGNoYXIqIHdlYmtpdF93ZWJfdmlld19nZXRfY3VzdG9tX2VuY29kaW5nKFdlYktpdFdlYlZpZXcq IHdlYlZpZXcpCiAKICAgICBpZiAoIW92ZXJyaWRlRW5jb2RpbmcuaXNFbXB0eSgpKSB7CiAgICAg ICAgIFdlYktpdFdlYlZpZXdQcml2YXRlKiBwcml2ID0gd2ViVmlldy0+cHJpdjsKLSAgICAgICAg cHJpdi0+Y3VzdG9tRW5jb2Rpbmcuc2V0KGdfc3RyZHVwKG92ZXJyaWRlRW5jb2RpbmcudXRmOCgp LmRhdGEoKSkpOwotICAgICAgICByZXR1cm4gcHJpdi0+Y3VzdG9tRW5jb2RpbmcuZ2V0KCk7Cisg ICAgICAgIGdfZnJlZSAocHJpdi0+Y3VzdG9tRW5jb2RpbmcpOworICAgICAgICBwcml2LT5jdXN0 b21FbmNvZGluZyA9IGdfc3RyZHVwKG92ZXJyaWRlRW5jb2RpbmcudXRmOCgpLmRhdGEoKSk7Cisg ICAgICAgIHJldHVybiBwcml2LT5jdXN0b21FbmNvZGluZzsKICAgICB9IGVsc2UKICAgICAgIHJl dHVybiBOVUxMOwogfQpAQCAtNDA3MiwxMSArNDEyMywxMSBAQCB2b2lkIHdlYmtpdF93ZWJfdmll d19hZGRfcmVzb3VyY2UoV2ViS2l0V2ViVmlldyogd2ViVmlldywgY2hhciogaWRlbnRpZmllciwg V2ViSwogCiAgICAgaWYgKCFwcml2LT5tYWluUmVzb3VyY2UpIHsKICAgICAgICAgcHJpdi0+bWFp blJlc291cmNlID0gd2ViUmVzb3VyY2U7Ci0gICAgICAgIHByaXYtPm1haW5SZXNvdXJjZUlkZW50 aWZpZXIuc2V0KGdfc3RyZHVwKGlkZW50aWZpZXIpKTsKKyAgICAgICAgcHJpdi0+bWFpblJlc291 cmNlSWRlbnRpZmllciA9IGdfc3RyZHVwKGlkZW50aWZpZXIpOwogICAgICAgICByZXR1cm47CiAg ICAgfQogCi0gICAgZ19oYXNoX3RhYmxlX2luc2VydChwcml2LT5zdWJSZXNvdXJjZXMuZ2V0KCks IGlkZW50aWZpZXIsIHdlYlJlc291cmNlKTsKKyAgICBnX2hhc2hfdGFibGVfaW5zZXJ0KHByaXYt PnN1YlJlc291cmNlcywgaWRlbnRpZmllciwgd2ViUmVzb3VyY2UpOwogfQogCiBXZWJLaXRXZWJS ZXNvdXJjZSogd2Via2l0X3dlYl92aWV3X2dldF9yZXNvdXJjZShXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3LCBjaGFyKiBpZGVudGlmaWVyKQpAQCAtNDA4NCwxMyArNDEzNSwxMyBAQCBXZWJLaXRXZWJS ZXNvdXJjZSogd2Via2l0X3dlYl92aWV3X2dldF9yZXNvdXJjZShXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3LCBjaGFyKiBpZAogICAgIFdlYktpdFdlYlZpZXdQcml2YXRlKiBwcml2ID0gd2ViVmlldy0+ cHJpdjsKICAgICBncG9pbnRlciB3ZWJSZXNvdXJjZSA9IE5VTEw7CiAKLSAgICBnYm9vbGVhbiBy ZXNvdXJjZUZvdW5kID0gZ19oYXNoX3RhYmxlX2xvb2t1cF9leHRlbmRlZChwcml2LT5zdWJSZXNv dXJjZXMuZ2V0KCksIGlkZW50aWZpZXIsIE5VTEwsICZ3ZWJSZXNvdXJjZSk7CisgICAgZ2Jvb2xl YW4gcmVzb3VyY2VGb3VuZCA9IGdfaGFzaF90YWJsZV9sb29rdXBfZXh0ZW5kZWQocHJpdi0+c3Vi UmVzb3VyY2VzLCBpZGVudGlmaWVyLCBOVUxMLCAmd2ViUmVzb3VyY2UpOwogCiAgICAgLy8gVGhl IG9ubHkgcmVzb3VyY2Ugd2UgZG8gbm90IHN0b3JlIGluIHRoaXMgaGFzaCB0YWJsZSBpcyB0aGUK ICAgICAvLyBtYWluISAgSWYgd2UgZGlkIG5vdCBmaW5kIGEgcmVxdWVzdCwgaXQgcHJvYmFibHkg bWVhbnMgdGhlIGxvYWQKICAgICAvLyBoYXMgYmVlbiBpbnRlcnJ1cHRlZCB3aGlsZSB3aGlsZSBh IHJlc291cmNlIHdhcyBzdGlsbCBiZWluZwogICAgIC8vIGxvYWRlZC4KLSAgICBpZiAoIXJlc291 cmNlRm91bmQgJiYgIWdfc3RyX2VxdWFsKGlkZW50aWZpZXIsIHByaXYtPm1haW5SZXNvdXJjZUlk ZW50aWZpZXIuZ2V0KCkpKQorICAgIGlmICghcmVzb3VyY2VGb3VuZCAmJiAhZ19zdHJfZXF1YWwo aWRlbnRpZmllciwgcHJpdi0+bWFpblJlc291cmNlSWRlbnRpZmllcikpCiAgICAgICAgIHJldHVy biBOVUxMOwogCiAgICAgaWYgKCF3ZWJSZXNvdXJjZSkKQEAgLTQxMDEsMjQgKzQxNTIsMzAgQEAg V2ViS2l0V2ViUmVzb3VyY2UqIHdlYmtpdF93ZWJfdmlld19nZXRfcmVzb3VyY2UoV2ViS2l0V2Vi Vmlldyogd2ViVmlldywgY2hhciogaWQKIAogV2ViS2l0V2ViUmVzb3VyY2UqIHdlYmtpdF93ZWJf dmlld19nZXRfbWFpbl9yZXNvdXJjZShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogewotICAgIHJl dHVybiB3ZWJWaWV3LT5wcml2LT5tYWluUmVzb3VyY2UuZ2V0KCk7CisgICAgcmV0dXJuIHdlYlZp ZXctPnByaXYtPm1haW5SZXNvdXJjZTsKIH0KIAogdm9pZCB3ZWJraXRfd2ViX3ZpZXdfY2xlYXJf cmVzb3VyY2VzKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiB7CiAgICAgV2ViS2l0V2ViVmlld1By aXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2OwotICAgIHByaXYtPm1haW5SZXNvdXJjZUlkZW50 aWZpZXIuY2xlYXIoKTsKLSAgICBwcml2LT5tYWluUmVzb3VyY2UuY2xlYXIoKTsKKworICAgIGdf ZnJlZShwcml2LT5tYWluUmVzb3VyY2VJZGVudGlmaWVyKTsKKyAgICBwcml2LT5tYWluUmVzb3Vy Y2VJZGVudGlmaWVyID0gTlVMTDsKKworICAgIGlmIChwcml2LT5tYWluUmVzb3VyY2UpIHsKKyAg ICAgICAgZ19vYmplY3RfdW5yZWYocHJpdi0+bWFpblJlc291cmNlKTsKKyAgICAgICAgcHJpdi0+ bWFpblJlc291cmNlID0gTlVMTDsKKyAgICB9CiAKICAgICBpZiAocHJpdi0+c3ViUmVzb3VyY2Vz KQotICAgICAgICBnX2hhc2hfdGFibGVfcmVtb3ZlX2FsbChwcml2LT5zdWJSZXNvdXJjZXMuZ2V0 KCkpOworICAgICAgICBnX2hhc2hfdGFibGVfcmVtb3ZlX2FsbChwcml2LT5zdWJSZXNvdXJjZXMp OwogfQogCiBHTGlzdCogd2Via2l0X3dlYl92aWV3X2dldF9zdWJyZXNvdXJjZXMoV2ViS2l0V2Vi Vmlldyogd2ViVmlldykKIHsKICAgICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IHdlYlZp ZXctPnByaXY7Ci0gICAgR0xpc3QqIHN1YlJlc291cmNlcyA9IGdfaGFzaF90YWJsZV9nZXRfdmFs dWVzKHByaXYtPnN1YlJlc291cmNlcy5nZXQoKSk7Ci0gICAgcmV0dXJuIGdfbGlzdF9yZW1vdmUo c3ViUmVzb3VyY2VzLCBwcml2LT5tYWluUmVzb3VyY2UuZ2V0KCkpOworICAgIEdMaXN0KiBzdWJS ZXNvdXJjZXMgPSBnX2hhc2hfdGFibGVfZ2V0X3ZhbHVlcyhwcml2LT5zdWJSZXNvdXJjZXMpOwor ICAgIHJldHVybiBnX2xpc3RfcmVtb3ZlKHN1YlJlc291cmNlcywgcHJpdi0+bWFpblJlc291cmNl KTsKIH0KIAogLyogRnJvbSBFdmVudEhhbmRsZXIuY3BwICovCkBAIC00MTM0LDExICs0MTkxLDEy IEBAIHZvaWQgd2Via2l0X3dlYl92aWV3X3NldF90b29sdGlwX3RleHQoV2ViS2l0V2ViVmlldyog d2ViVmlldywgY29uc3QgY2hhciogdG9vbHRpCiB7CiAjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwg MTIsIDApCiAgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2Owor ICAgIGdfZnJlZShwcml2LT50b29sdGlwVGV4dCk7CiAgICAgaWYgKHRvb2x0aXAgJiYgKnRvb2x0 aXAgIT0gJ1wwJykgewotICAgICAgICBwcml2LT50b29sdGlwVGV4dC5zZXQoZ19zdHJkdXAodG9v bHRpcCkpOworICAgICAgICBwcml2LT50b29sdGlwVGV4dCA9IGdfc3RyZHVwKHRvb2x0aXApOwog ICAgICAgICBndGtfd2lkZ2V0X3NldF9oYXNfdG9vbHRpcChHVEtfV0lER0VUKHdlYlZpZXcpLCBU UlVFKTsKICAgICB9IGVsc2UgewotICAgICAgICBwcml2LT50b29sdGlwVGV4dC5jbGVhcigpOwor ICAgICAgICBwcml2LT50b29sdGlwVGV4dCA9IDA7CiAgICAgICAgIGd0a193aWRnZXRfc2V0X2hh c190b29sdGlwKEdUS19XSURHRVQod2ViVmlldyksIEZBTFNFKTsKICAgICB9CiAKQEAgLTQxOTYs OCArNDI1NCw5IEBAIEdfQ09OU1RfUkVUVVJOIGdjaGFyKiB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2lj b25fdXJpKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiAgICAgU3RyaW5nIGljb25VUkwgPSBpY29u RGF0YWJhc2UoKS0+aWNvblVSTEZvclBhZ2VVUkwoY29yZVBhZ2UtPm1haW5GcmFtZSgpLT5sb2Fk ZXIoKS0+dXJsKCkucHJldHR5VVJMKCkpOwogCiAgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHBy aXYgPSB3ZWJWaWV3LT5wcml2OwotICAgIHByaXYtPmljb25VUkkuc2V0KGdfc3RyZHVwKGljb25V UkwudXRmOCgpLmRhdGEoKSkpOwotICAgIHJldHVybiBwcml2LT5pY29uVVJJLmdldCgpOworICAg IGdfZnJlZShwcml2LT5pY29uVVJJKTsKKyAgICBwcml2LT5pY29uVVJJID0gZ19zdHJkdXAoaWNv blVSTC51dGY4KCkuZGF0YSgpKTsKKyAgICByZXR1cm4gcHJpdi0+aWNvblVSSTsKIH0KIAogLyoq Cg==