60501 2011-05-09 14:08:39 -0700 Abstract line deletion code into a function 2011-05-09 17:21:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60113 1 eric eric abarth commit-queue eric leviw rniwa webkit.review.bot oldest_to_newest 400738 0 eric 2011-05-09 14:08:39 -0700 Abstract line deletion code into a function 400739 1 92846 eric 2011-05-09 14:09:15 -0700 Created attachment 92846 causes crashes, unsure why 400754 2 92850 eric 2011-05-09 14:28:04 -0700 Created attachment 92850 Patch 400812 3 92850 commit-queue 2011-05-09 15:27:39 -0700 Comment on attachment 92850 Patch Clearing flags on attachment: 92850 Committed r86093: <http://trac.webkit.org/changeset/86093> 400813 4 commit-queue 2011-05-09 15:27:45 -0700 All reviewed patches have been landed. Closing bug. 400917 5 webkit.review.bot 2011-05-09 17:21:04 -0700 http://trac.webkit.org/changeset/86093 might have broken GTK Linux 64-bit Debug 92846 2011-05-09 14:09:15 -0700 2011-05-09 14:28:00 -0700 causes crashes, unsure why bug-60501-20110509140913.patch text/plain 5600 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODYwNjUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5MjAzYzhkZGEzODA2YTJl NTA1NjI1MWM2ZDA1NGY4MWM4YzYyMDJhLi42M2I3ZjI4NTk1NjIyZjk0NjQ3NzYwYmZiYzFmZTI1 ZmU5ZDZlMjU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDUtMDkgIEVyaWMg U2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFic3RyYWN0IGxpbmUgZGVsZXRpb24gY29kZSBpbnRvIGEgZnVu Y3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYw NTAxCisKKyAgICAgICAgVGhpcyBzaG91bGRuJ3QgY2hhbmdlIGJlaGF2aW9yLCBidXQgY3VycmVu dGx5CisgICAgICAgIHNlZW1zIHRvIGNhdXNlIGEgY3Jhc2guICBTdGlsbCBpbnZlc3RpZ2F0aW5n IHdoeS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6ZGVsZXRlTGluZVJhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJsb2NrOjpsYXlvdXRSdW5zQW5kRmxvYXRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJsb2NrOjpkZXRlcm1pbmVTdGFydFBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJsb2NrOjptYXRjaGVkRW5kTGluZSk6CisKIDIwMTEtMDUtMDcgIE1hcnRpbiBSb2JpbnNvbiAg PG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbmllbCBCYXRl cy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVM YXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91 dC5jcHAKaW5kZXggYmI3MDBjMDE5ZmJhOTIxMDc3ZTk2NDk4ZGViNGExODIzOGUwYTczMC4uOWMw NzZkNjJjNzAxODU1MjZkZTkwN2ExOTcwZTg5NjRhNjliYTQ3MiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKQEAgLTgxNiw2ICs4 MTYsMTggQEAgUm9vdElubGluZUJveCogUmVuZGVyQmxvY2s6OmNyZWF0ZUxpbmVCb3hlc0Zyb21C aWRpUnVucyhCaWRpUnVuTGlzdDxCaWRpUnVuPiYgYmkKICAgICByZXR1cm4gbGluZUJveDsKIH0K IAorc3RhdGljIHZvaWQgZGVsZXRlTGluZVJhbmdlKFJlbmRlckFyZW5hKiBhcmVuYSwgUm9vdElu bGluZUJveCogc3RhcnRMaW5lLCBpbnQmIHJlcGFpbnRMb2dpY2FsVG9wLCBpbnQmIHJlcGFpbnRM b2dpY2FsQm90dG9tLCBSb290SW5saW5lQm94KiBzdG9wTGluZSA9IDApCit7CisgICAgUm9vdElu bGluZUJveCogYm94VG9EZWxldGUgPSBzdGFydExpbmU7CisgICAgd2hpbGUgKGJveFRvRGVsZXRl ICYmIGJveFRvRGVsZXRlICE9IHN0b3BMaW5lKSB7CisgICAgICAgIHJlcGFpbnRMb2dpY2FsVG9w ID0gbWluKHJlcGFpbnRMb2dpY2FsVG9wLCBib3hUb0RlbGV0ZS0+bG9naWNhbFRvcFZpc3VhbE92 ZXJmbG93KCkpOworICAgICAgICByZXBhaW50TG9naWNhbEJvdHRvbSA9IG1heChyZXBhaW50TG9n aWNhbEJvdHRvbSwgYm94VG9EZWxldGUtPmxvZ2ljYWxCb3R0b21WaXN1YWxPdmVyZmxvdygpKTsK KyAgICAgICAgUm9vdElubGluZUJveCogbmV4dCA9IGJveFRvRGVsZXRlLT5uZXh0Um9vdEJveCgp OworICAgICAgICBib3hUb0RlbGV0ZS0+ZGVsZXRlTGluZShhcmVuYSk7CisgICAgICAgIGJveFRv RGVsZXRlID0gbmV4dDsKKyAgICB9Cit9CisKIHZvaWQgUmVuZGVyQmxvY2s6OmxheW91dFJ1bnNB bmRGbG9hdHMoYm9vbCBmdWxsTGF5b3V0LCBib29sIGhhc0lubGluZUNoaWxkLCBWZWN0b3I8Rmxv YXRXaXRoUmVjdD4mIGZsb2F0cywgaW50JiByZXBhaW50TG9naWNhbFRvcCwgaW50JiByZXBhaW50 TG9naWNhbEJvdHRvbSkKIHsKICAgICAvLyBXZSB3YW50IHRvIHNraXAgYWhlYWQgdG8gdGhlIGZp cnN0IGRpcnR5IGxpbmUKQEAgLTg2MSwxNSArODczLDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6bGF5 b3V0UnVuc0FuZEZsb2F0cyhib29sIGZ1bGxMYXlvdXQsIGJvb2wgaGFzSW5saW5lQ2hpbGQsIFZl Y3QKICAgICAgICAgICAgIHJlcGFpbnRMb2dpY2FsVG9wID0gbG9naWNhbEhlaWdodCgpOwogICAg ICAgICAgICAgcmVwYWludExvZ2ljYWxCb3R0b20gPSBsb2dpY2FsSGVpZ2h0KCk7CiAgICAgICAg IH0KLSAgICAgICAgUmVuZGVyQXJlbmEqIGFyZW5hID0gcmVuZGVyQXJlbmEoKTsKLSAgICAgICAg Um9vdElubGluZUJveCogYm94ID0gc3RhcnRMaW5lOwotICAgICAgICB3aGlsZSAoYm94KSB7Ci0g ICAgICAgICAgICByZXBhaW50TG9naWNhbFRvcCA9IG1pbihyZXBhaW50TG9naWNhbFRvcCwgYm94 LT5sb2dpY2FsVG9wVmlzdWFsT3ZlcmZsb3coKSk7Ci0gICAgICAgICAgICByZXBhaW50TG9naWNh bEJvdHRvbSA9IG1heChyZXBhaW50TG9naWNhbEJvdHRvbSwgYm94LT5sb2dpY2FsQm90dG9tVmlz dWFsT3ZlcmZsb3coKSk7Ci0gICAgICAgICAgICBSb290SW5saW5lQm94KiBuZXh0ID0gYm94LT5u ZXh0Um9vdEJveCgpOwotICAgICAgICAgICAgYm94LT5kZWxldGVMaW5lKGFyZW5hKTsKLSAgICAg ICAgICAgIGJveCA9IG5leHQ7Ci0gICAgICAgIH0KKyAgICAgICAgZGVsZXRlTGluZVJhbmdlKHJl bmRlckFyZW5hKCksIHN0YXJ0TGluZSwgcmVwYWludExvZ2ljYWxUb3AsIHJlcGFpbnRMb2dpY2Fs Qm90dG9tKTsKICAgICB9CiAKICAgICBJbmxpbmVJdGVyYXRvciBlbmQgPSByZXNvbHZlci5wb3Np dGlvbigpOwpAQCAtMTA0MiwxNSArMTA0Niw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmxheW91dFJ1 bnNBbmRGbG9hdHMoYm9vbCBmdWxsTGF5b3V0LCBib29sIGhhc0lubGluZUNoaWxkLCBWZWN0CiAg ICAgICAgICAgICBzZXRMb2dpY2FsSGVpZ2h0KGxhc3RSb290Qm94KCktPmJsb2NrTG9naWNhbEhl aWdodCgpKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIC8vIERlbGV0ZSBhbGwgdGhl IHJlbWFpbmluZyBsaW5lcy4KLSAgICAgICAgICAgIFJvb3RJbmxpbmVCb3gqIGxpbmUgPSBlbmRM aW5lOwotICAgICAgICAgICAgUmVuZGVyQXJlbmEqIGFyZW5hID0gcmVuZGVyQXJlbmEoKTsKLSAg ICAgICAgICAgIHdoaWxlIChsaW5lKSB7Ci0gICAgICAgICAgICAgICAgcmVwYWludExvZ2ljYWxU b3AgPSBtaW4ocmVwYWludExvZ2ljYWxUb3AsIGxpbmUtPmxvZ2ljYWxUb3BWaXN1YWxPdmVyZmxv dygpKTsKLSAgICAgICAgICAgICAgICByZXBhaW50TG9naWNhbEJvdHRvbSA9IG1heChyZXBhaW50 TG9naWNhbEJvdHRvbSwgbGluZS0+bG9naWNhbEJvdHRvbVZpc3VhbE92ZXJmbG93KCkpOwotICAg ICAgICAgICAgICAgIFJvb3RJbmxpbmVCb3gqIG5leHQgPSBsaW5lLT5uZXh0Um9vdEJveCgpOwot ICAgICAgICAgICAgICAgIGxpbmUtPmRlbGV0ZUxpbmUoYXJlbmEpOwotICAgICAgICAgICAgICAg IGxpbmUgPSBuZXh0OwotICAgICAgICAgICAgfQorICAgICAgICAgICAgZGVsZXRlTGluZVJhbmdl KHJlbmRlckFyZW5hKCksIGVuZExpbmUsIHJlcGFpbnRMb2dpY2FsVG9wLCByZXBhaW50TG9naWNh bEJvdHRvbSk7CiAgICAgICAgIH0KICAgICB9CiAgICAgaWYgKG1fZmxvYXRpbmdPYmplY3RzICYm IChjaGVja0ZvckZsb2F0c0Zyb21MYXN0TGluZSB8fCBwb3NpdGlvbk5ld0Zsb2F0cygpKSAmJiBs YXN0Um9vdEJveCgpKSB7CkBAIC0xMjYxLDEzICsxMjU3LDEwIEBAIFJvb3RJbmxpbmVCb3gqIFJl bmRlckJsb2NrOjpkZXRlcm1pbmVTdGFydFBvc2l0aW9uKExpbmVJbmZvJiBsaW5lSW5mbywgYm9v bCYgZnVsCiAgICAgaWYgKGZ1bGxMYXlvdXQpIHsKICAgICAgICAgLy8gTnVrZSBhbGwgb3VyIGxp bmVzLgogICAgICAgICBpZiAoZmlyc3RSb290Qm94KCkpIHsKLSAgICAgICAgICAgIFJlbmRlckFy ZW5hKiBhcmVuYSA9IHJlbmRlckFyZW5hKCk7Ci0gICAgICAgICAgICBjdXJyID0gZmlyc3RSb290 Qm94KCk7Ci0gICAgICAgICAgICB3aGlsZSAoY3VycikgewotICAgICAgICAgICAgICAgIFJvb3RJ bmxpbmVCb3gqIG5leHQgPSBjdXJyLT5uZXh0Um9vdEJveCgpOwotICAgICAgICAgICAgICAgIGN1 cnItPmRlbGV0ZUxpbmUoYXJlbmEpOwotICAgICAgICAgICAgICAgIGN1cnIgPSBuZXh0OwotICAg ICAgICAgICAgfQorICAgICAgICAgICAgLy8gRklYTUU6IEkgc3VzcGVjdCB0aGVzZSBkb24ndCBo YXZlIHRvIGJlIGlnbm9yZWQuCisgICAgICAgICAgICBpbnQgaWdub3JlZFJlcGFpbnRMb2dpY2Fs VG9wID0gMDsKKyAgICAgICAgICAgIGludCBpZ25vcmVkUmVwYWludExvZ2ljYWxCb3R0b20gPSAw OworICAgICAgICAgICAgZGVsZXRlTGluZVJhbmdlKHJlbmRlckFyZW5hKCksIGZpcnN0Um9vdEJv eCgpLCBpZ25vcmVkUmVwYWludExvZ2ljYWxUb3AsIGlnbm9yZWRSZXBhaW50TG9naWNhbEJvdHRv bSk7CiAgICAgICAgICAgICBBU1NFUlQoIWZpcnN0TGluZUJveCgpICYmICFsYXN0TGluZUJveCgp KTsKICAgICAgICAgfQogICAgIH0gZWxzZSB7CkBAIC0xNDMwLDE2ICsxNDIzLDcgQEAgYm9vbCBS ZW5kZXJCbG9jazo6bWF0Y2hlZEVuZExpbmUoY29uc3QgSW5saW5lQmlkaVJlc29sdmVyJiByZXNv bHZlciwgY29uc3QgSW5saW4KICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgLy8gTm93IGRl bGV0ZSB0aGUgbGluZXMgdGhhdCB3ZSBmYWlsZWQgdG8gc3luYy4KLSAgICAgICAgICAgIFJvb3RJ bmxpbmVCb3gqIGJveFRvRGVsZXRlID0gZW5kTGluZTsKLSAgICAgICAgICAgIFJlbmRlckFyZW5h KiBhcmVuYSA9IHJlbmRlckFyZW5hKCk7Ci0gICAgICAgICAgICB3aGlsZSAoYm94VG9EZWxldGUg JiYgYm94VG9EZWxldGUgIT0gcmVzdWx0KSB7Ci0gICAgICAgICAgICAgICAgcmVwYWludExvZ2lj YWxUb3AgPSBtaW4ocmVwYWludExvZ2ljYWxUb3AsIGJveFRvRGVsZXRlLT5sb2dpY2FsVG9wVmlz dWFsT3ZlcmZsb3coKSk7Ci0gICAgICAgICAgICAgICAgcmVwYWludExvZ2ljYWxCb3R0b20gPSBt YXgocmVwYWludExvZ2ljYWxCb3R0b20sIGJveFRvRGVsZXRlLT5sb2dpY2FsQm90dG9tVmlzdWFs T3ZlcmZsb3coKSk7Ci0gICAgICAgICAgICAgICAgUm9vdElubGluZUJveCogbmV4dCA9IGJveFRv RGVsZXRlLT5uZXh0Um9vdEJveCgpOwotICAgICAgICAgICAgICAgIGJveFRvRGVsZXRlLT5kZWxl dGVMaW5lKGFyZW5hKTsKLSAgICAgICAgICAgICAgICBib3hUb0RlbGV0ZSA9IG5leHQ7Ci0gICAg ICAgICAgICB9Ci0KKyAgICAgICAgICAgIGRlbGV0ZUxpbmVSYW5nZShyZW5kZXJBcmVuYSgpLCBl bmRMaW5lLCByZXBhaW50TG9naWNhbFRvcCwgcmVwYWludExvZ2ljYWxCb3R0b20sIHJlc3VsdCk7 CiAgICAgICAgICAgICBlbmRMaW5lID0gcmVzdWx0OwogICAgICAgICAgICAgcmV0dXJuIHJlc3Vs dDsKICAgICAgICAgfQo= 92850 2011-05-09 14:28:04 -0700 2011-05-09 15:27:39 -0700 Patch bug-60501-20110509142803.patch text/plain 4725 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODYwNjUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5MjAzYzhkZGEzODA2YTJl NTA1NjI1MWM2ZDA1NGY4MWM4YzYyMDJhLi5lM2Y1MGE4MTEyYjM1MTBmMmQxZTRiMjViNWJmZWJj MTIyYjQyYmFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDUtMDkgIEVyaWMg U2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFic3RyYWN0IGxpbmUgZGVsZXRpb24gY29kZSBpbnRvIGEgZnVu Y3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYw NTAxCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGJlaGF2aW9yLCB0aHVzIG5vIHRlc3RpbmcuCisK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OmRlbGV0ZUxpbmVSYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9j azo6bGF5b3V0UnVuc0FuZEZsb2F0cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6 ZGV0ZXJtaW5lU3RhcnRQb3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6 bWF0Y2hlZEVuZExpbmUpOgorCiAyMDExLTA1LTA3ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5z b25AaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW5pZWwgQmF0ZXMuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCmlu ZGV4IGJiNzAwYzAxOWZiYTkyMTA3N2U5NjQ5OGRlYjRhMTgyMzhlMGE3MzAuLjVjMTIxNjY5OGIx ZmY4ZGExY2JkYTM4MDk1Yzg5OGNkZDY2OGE4NzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCkBAIC04MTYsNiArODE2LDE4IEBA IFJvb3RJbmxpbmVCb3gqIFJlbmRlckJsb2NrOjpjcmVhdGVMaW5lQm94ZXNGcm9tQmlkaVJ1bnMo QmlkaVJ1bkxpc3Q8QmlkaVJ1bj4mIGJpCiAgICAgcmV0dXJuIGxpbmVCb3g7CiB9CiAKK3N0YXRp YyB2b2lkIGRlbGV0ZUxpbmVSYW5nZShSZW5kZXJBcmVuYSogYXJlbmEsIFJvb3RJbmxpbmVCb3gq IHN0YXJ0TGluZSwgaW50JiByZXBhaW50TG9naWNhbFRvcCwgaW50JiByZXBhaW50TG9naWNhbEJv dHRvbSwgUm9vdElubGluZUJveCogc3RvcExpbmUgPSAwKQoreworICAgIFJvb3RJbmxpbmVCb3gq IGJveFRvRGVsZXRlID0gc3RhcnRMaW5lOworICAgIHdoaWxlIChib3hUb0RlbGV0ZSAmJiBib3hU b0RlbGV0ZSAhPSBzdG9wTGluZSkgeworICAgICAgICByZXBhaW50TG9naWNhbFRvcCA9IG1pbihy ZXBhaW50TG9naWNhbFRvcCwgYm94VG9EZWxldGUtPmxvZ2ljYWxUb3BWaXN1YWxPdmVyZmxvdygp KTsKKyAgICAgICAgcmVwYWludExvZ2ljYWxCb3R0b20gPSBtYXgocmVwYWludExvZ2ljYWxCb3R0 b20sIGJveFRvRGVsZXRlLT5sb2dpY2FsQm90dG9tVmlzdWFsT3ZlcmZsb3coKSk7CisgICAgICAg IFJvb3RJbmxpbmVCb3gqIG5leHQgPSBib3hUb0RlbGV0ZS0+bmV4dFJvb3RCb3goKTsKKyAgICAg ICAgYm94VG9EZWxldGUtPmRlbGV0ZUxpbmUoYXJlbmEpOworICAgICAgICBib3hUb0RlbGV0ZSA9 IG5leHQ7CisgICAgfQorfQorCiB2b2lkIFJlbmRlckJsb2NrOjpsYXlvdXRSdW5zQW5kRmxvYXRz KGJvb2wgZnVsbExheW91dCwgYm9vbCBoYXNJbmxpbmVDaGlsZCwgVmVjdG9yPEZsb2F0V2l0aFJl Y3Q+JiBmbG9hdHMsIGludCYgcmVwYWludExvZ2ljYWxUb3AsIGludCYgcmVwYWludExvZ2ljYWxC b3R0b20pCiB7CiAgICAgLy8gV2Ugd2FudCB0byBza2lwIGFoZWFkIHRvIHRoZSBmaXJzdCBkaXJ0 eSBsaW5lCkBAIC04NjEsMTUgKzg3Myw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmxheW91dFJ1bnNB bmRGbG9hdHMoYm9vbCBmdWxsTGF5b3V0LCBib29sIGhhc0lubGluZUNoaWxkLCBWZWN0CiAgICAg ICAgICAgICByZXBhaW50TG9naWNhbFRvcCA9IGxvZ2ljYWxIZWlnaHQoKTsKICAgICAgICAgICAg IHJlcGFpbnRMb2dpY2FsQm90dG9tID0gbG9naWNhbEhlaWdodCgpOwogICAgICAgICB9Ci0gICAg ICAgIFJlbmRlckFyZW5hKiBhcmVuYSA9IHJlbmRlckFyZW5hKCk7Ci0gICAgICAgIFJvb3RJbmxp bmVCb3gqIGJveCA9IHN0YXJ0TGluZTsKLSAgICAgICAgd2hpbGUgKGJveCkgewotICAgICAgICAg ICAgcmVwYWludExvZ2ljYWxUb3AgPSBtaW4ocmVwYWludExvZ2ljYWxUb3AsIGJveC0+bG9naWNh bFRvcFZpc3VhbE92ZXJmbG93KCkpOwotICAgICAgICAgICAgcmVwYWludExvZ2ljYWxCb3R0b20g PSBtYXgocmVwYWludExvZ2ljYWxCb3R0b20sIGJveC0+bG9naWNhbEJvdHRvbVZpc3VhbE92ZXJm bG93KCkpOwotICAgICAgICAgICAgUm9vdElubGluZUJveCogbmV4dCA9IGJveC0+bmV4dFJvb3RC b3goKTsKLSAgICAgICAgICAgIGJveC0+ZGVsZXRlTGluZShhcmVuYSk7Ci0gICAgICAgICAgICBi b3ggPSBuZXh0OwotICAgICAgICB9CisgICAgICAgIGRlbGV0ZUxpbmVSYW5nZShyZW5kZXJBcmVu YSgpLCBzdGFydExpbmUsIHJlcGFpbnRMb2dpY2FsVG9wLCByZXBhaW50TG9naWNhbEJvdHRvbSk7 CiAgICAgfQogCiAgICAgSW5saW5lSXRlcmF0b3IgZW5kID0gcmVzb2x2ZXIucG9zaXRpb24oKTsK QEAgLTEwNDIsMTUgKzEwNDYsNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpsYXlvdXRSdW5zQW5kRmxv YXRzKGJvb2wgZnVsbExheW91dCwgYm9vbCBoYXNJbmxpbmVDaGlsZCwgVmVjdAogICAgICAgICAg ICAgc2V0TG9naWNhbEhlaWdodChsYXN0Um9vdEJveCgpLT5ibG9ja0xvZ2ljYWxIZWlnaHQoKSk7 CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAvLyBEZWxldGUgYWxsIHRoZSByZW1haW5p bmcgbGluZXMuCi0gICAgICAgICAgICBSb290SW5saW5lQm94KiBsaW5lID0gZW5kTGluZTsKLSAg ICAgICAgICAgIFJlbmRlckFyZW5hKiBhcmVuYSA9IHJlbmRlckFyZW5hKCk7Ci0gICAgICAgICAg ICB3aGlsZSAobGluZSkgewotICAgICAgICAgICAgICAgIHJlcGFpbnRMb2dpY2FsVG9wID0gbWlu KHJlcGFpbnRMb2dpY2FsVG9wLCBsaW5lLT5sb2dpY2FsVG9wVmlzdWFsT3ZlcmZsb3coKSk7Ci0g ICAgICAgICAgICAgICAgcmVwYWludExvZ2ljYWxCb3R0b20gPSBtYXgocmVwYWludExvZ2ljYWxC b3R0b20sIGxpbmUtPmxvZ2ljYWxCb3R0b21WaXN1YWxPdmVyZmxvdygpKTsKLSAgICAgICAgICAg ICAgICBSb290SW5saW5lQm94KiBuZXh0ID0gbGluZS0+bmV4dFJvb3RCb3goKTsKLSAgICAgICAg ICAgICAgICBsaW5lLT5kZWxldGVMaW5lKGFyZW5hKTsKLSAgICAgICAgICAgICAgICBsaW5lID0g bmV4dDsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGRlbGV0ZUxpbmVSYW5nZShyZW5kZXJB cmVuYSgpLCBlbmRMaW5lLCByZXBhaW50TG9naWNhbFRvcCwgcmVwYWludExvZ2ljYWxCb3R0b20p OwogICAgICAgICB9CiAgICAgfQogICAgIGlmIChtX2Zsb2F0aW5nT2JqZWN0cyAmJiAoY2hlY2tG b3JGbG9hdHNGcm9tTGFzdExpbmUgfHwgcG9zaXRpb25OZXdGbG9hdHMoKSkgJiYgbGFzdFJvb3RC b3goKSkgewpAQCAtMTQzMCwxNiArMTQyNiw3IEBAIGJvb2wgUmVuZGVyQmxvY2s6Om1hdGNoZWRF bmRMaW5lKGNvbnN0IElubGluZUJpZGlSZXNvbHZlciYgcmVzb2x2ZXIsIGNvbnN0IElubGluCiAg ICAgICAgICAgICB9CiAKICAgICAgICAgICAgIC8vIE5vdyBkZWxldGUgdGhlIGxpbmVzIHRoYXQg d2UgZmFpbGVkIHRvIHN5bmMuCi0gICAgICAgICAgICBSb290SW5saW5lQm94KiBib3hUb0RlbGV0 ZSA9IGVuZExpbmU7Ci0gICAgICAgICAgICBSZW5kZXJBcmVuYSogYXJlbmEgPSByZW5kZXJBcmVu YSgpOwotICAgICAgICAgICAgd2hpbGUgKGJveFRvRGVsZXRlICYmIGJveFRvRGVsZXRlICE9IHJl c3VsdCkgewotICAgICAgICAgICAgICAgIHJlcGFpbnRMb2dpY2FsVG9wID0gbWluKHJlcGFpbnRM b2dpY2FsVG9wLCBib3hUb0RlbGV0ZS0+bG9naWNhbFRvcFZpc3VhbE92ZXJmbG93KCkpOwotICAg ICAgICAgICAgICAgIHJlcGFpbnRMb2dpY2FsQm90dG9tID0gbWF4KHJlcGFpbnRMb2dpY2FsQm90 dG9tLCBib3hUb0RlbGV0ZS0+bG9naWNhbEJvdHRvbVZpc3VhbE92ZXJmbG93KCkpOwotICAgICAg ICAgICAgICAgIFJvb3RJbmxpbmVCb3gqIG5leHQgPSBib3hUb0RlbGV0ZS0+bmV4dFJvb3RCb3go KTsKLSAgICAgICAgICAgICAgICBib3hUb0RlbGV0ZS0+ZGVsZXRlTGluZShhcmVuYSk7Ci0gICAg ICAgICAgICAgICAgYm94VG9EZWxldGUgPSBuZXh0OwotICAgICAgICAgICAgfQotCisgICAgICAg ICAgICBkZWxldGVMaW5lUmFuZ2UocmVuZGVyQXJlbmEoKSwgZW5kTGluZSwgcmVwYWludExvZ2lj YWxUb3AsIHJlcGFpbnRMb2dpY2FsQm90dG9tLCByZXN1bHQpOwogICAgICAgICAgICAgZW5kTGlu ZSA9IHJlc3VsdDsKICAgICAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgICAgIH0K