103690 2012-11-29 17:26:10 -0800 RenderBlock minor clean-up: replace raw pointers with OwnPtrs. 2012-11-30 15:23:14 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 loislo loislo abarth eric hyatt koivisto ojan simon.fraser webkit.review.bot oldest_to_newest 779641 0 loislo 2012-11-29 17:26:10 -0800 I found another place with raw memory management in RenderBlock code. patch to follow 779679 1 176869 loislo 2012-11-29 17:55:40 -0800 Created attachment 176869 Patch 780368 2 176869 abarth 2012-11-30 13:32:41 -0800 Comment on attachment 176869 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=176869&action=review > Source/WebCore/rendering/RenderBlock.cpp:3183 > continuations = new ListHashSet<RenderInline*>; > - table->set(this, continuations); > + table->set(this, adoptPtr(continuations)); Consider merging these lines. We prefer to call adoptPtr immediately after calling new: adoptPtr(new Foo(....)) 780371 3 176869 eric 2012-11-30 13:34:26 -0800 Comment on attachment 176869 Patch This seems reasonable. A little scary, but reasonable. I agree with Adam that putting adoptPtr on the same line as new is better. It might complicate a couple callers as you couldn't use a raw pointer for a local though. 780469 4 loislo 2012-11-30 15:23:14 -0800 Committed r136288: <http://trac.webkit.org/changeset/136288> 176869 2012-11-29 17:55:40 -0800 2012-11-30 13:34:26 -0800 Patch bug-103690-20121129175313.patch text/plain 9838 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2MTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmYwNjYzMWY3NTBlZmNh ZjRjMTI1ZjkyNDQzZTE2ZGVmYWUwYjlkMC4uOWU1YjU0M2Q4NTlmZjlkZWI1NmZjNDg3N2QxN2Ez MWY5NmFmYzNjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTExLTI5ICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW5kZXJCbG9j ayBtaW5vciBjbGVhbi11cDogcmVwbGFjZSByYXcgcG9pbnRlcnMgd2l0aCBPd25QdHJzLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzNjkwCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgcmF3IHBvaW50ZXJz IHdlcmUgcmVwbGFjZWQgd2l0aCBPd25QdHJzLgorICAgICAgICBQcm9iYWJseSB3ZSBhbHNvIGdh aW4gYSBzbWFsbCBwZXJmb3JtYW5jZSBpbXByb3ZlbWVudHMgYmVjYXVzZQorICAgICAgICBJIHJl cGxhY2VkIGdldCAmJiByZW1vdmUgcGFpciB3aXRoIHRha2UuCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3Jl OjpyZW1vdmVCbG9ja0Zyb21EZXNjZW5kYW50QW5kQ29udGFpbmVyTWFwcyk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJCbG9jazo6flJlbmRlckJsb2NrKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJsb2NrOjphZGRPdmVyZmxvd0Zyb21GbG9hdHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyQmxvY2s6OmFkZENvbnRpbnVhdGlvbldpdGhPdXRsaW5lKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckJsb2NrOjpwYWludENvbnRpbnVhdGlvbk91dGxpbmVzKToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckJsb2NrOjppbnNlcnRJbnRvVHJhY2tlZFJlbmRlcmVyTWFwcyk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJCbG9jazo6cmVtb3ZlRnJvbVRyYWNrZWRSZW5kZXJlck1hcHMpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnNldERlc2lyZWRDb2x1bW5Db3VudEFuZFdp ZHRoKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suaDoKKyAgICAgICAgKFdlYkNv cmUpOgorCiAyMDEyLTExLTI5ICBNaWtlIFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgVHlwbyBpbiAnYXV0b2ZvY3VzJyBzYW5kYm94aW5nIGVycm9yIG1lc3NhZ2UuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRleCA4YzYyNDk3NjU5ZWRmOTVj YmNiMzExOWE1YzlmY2U3MWIwZDMwNTNhLi4xOTVhOTQyN2YzMWQ2ZWI3NWE0YmQzNWMwMmYwYmZm ZGEwOTViNjM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAg LTk3LDcgKzk3LDcgQEAgc3RydWN0IFNhbWVTaXplQXNNYXJnaW5JbmZvIHsKICAgICBMYXlvdXRV bml0IG1hcmdpbnNbMl07CiB9OwogCi10eXBlZGVmIFdURjo6SGFzaE1hcDxjb25zdCBSZW5kZXJC b3gqLCBDb2x1bW5JbmZvKj4gQ29sdW1uSW5mb01hcDsKK3R5cGVkZWYgV1RGOjpIYXNoTWFwPGNv bnN0IFJlbmRlckJveCosIE93blB0cjxDb2x1bW5JbmZvPiA+IENvbHVtbkluZm9NYXA7CiBzdGF0 aWMgQ29sdW1uSW5mb01hcCogZ0NvbHVtbkluZm9NYXAgPSAwOwogCiBzdGF0aWMgVHJhY2tlZERl c2NlbmRhbnRzTWFwKiBnUG9zaXRpb25lZERlc2NlbmRhbnRzTWFwID0gMDsKQEAgLTEwNiw3ICsx MDYsNyBAQCBzdGF0aWMgVHJhY2tlZERlc2NlbmRhbnRzTWFwKiBnUGVyY2VudEhlaWdodERlc2Nl bmRhbnRzTWFwID0gMDsKIHN0YXRpYyBUcmFja2VkQ29udGFpbmVyTWFwKiBnUG9zaXRpb25lZENv bnRhaW5lck1hcCA9IDA7CiBzdGF0aWMgVHJhY2tlZENvbnRhaW5lck1hcCogZ1BlcmNlbnRIZWln aHRDb250YWluZXJNYXAgPSAwOwogICAgIAotdHlwZWRlZiBXVEY6Okhhc2hNYXA8UmVuZGVyQmxv Y2sqLCBMaXN0SGFzaFNldDxSZW5kZXJJbmxpbmUqPio+IENvbnRpbnVhdGlvbk91dGxpbmVUYWJs ZU1hcDsKK3R5cGVkZWYgV1RGOjpIYXNoTWFwPFJlbmRlckJsb2NrKiwgT3duUHRyPExpc3RIYXNo U2V0PFJlbmRlcklubGluZSo+ID4gPiBDb250aW51YXRpb25PdXRsaW5lVGFibGVNYXA7CiAKIHR5 cGVkZWYgV1RGOjpIYXNoU2V0PFJlbmRlckJsb2NrKj4gRGVsYXllZFVwZGF0ZVNjcm9sbEluZm9T ZXQ7CiBzdGF0aWMgaW50IGdEZWxheVVwZGF0ZVNjcm9sbEluZm8gPSAwOwpAQCAtMjAwLDIxICsy MDAsMTkgQEAgUmVuZGVyQmxvY2s6OlJlbmRlckJsb2NrKE5vZGUqIG5vZGUpCiAKIHN0YXRpYyB2 b2lkIHJlbW92ZUJsb2NrRnJvbURlc2NlbmRhbnRBbmRDb250YWluZXJNYXBzKFJlbmRlckJsb2Nr KiBibG9jaywgVHJhY2tlZERlc2NlbmRhbnRzTWFwKiYgZGVzY2VuZGFudE1hcCwgVHJhY2tlZENv bnRhaW5lck1hcComIGNvbnRhaW5lck1hcCkKIHsKLSAgICBpZiAoVHJhY2tlZFJlbmRlcmVyTGlz dEhhc2hTZXQqIGRlc2NlbmRhbnRTZXQgPSBkZXNjZW5kYW50TWFwLT50YWtlKGJsb2NrKSkgewor ICAgIGlmIChPd25QdHI8VHJhY2tlZFJlbmRlcmVyTGlzdEhhc2hTZXQ+IGRlc2NlbmRhbnRTZXQg PSBkZXNjZW5kYW50TWFwLT50YWtlKGJsb2NrKSkgewogICAgICAgICBUcmFja2VkUmVuZGVyZXJM aXN0SGFzaFNldDo6aXRlcmF0b3IgZW5kID0gZGVzY2VuZGFudFNldC0+ZW5kKCk7CiAgICAgICAg IGZvciAoVHJhY2tlZFJlbmRlcmVyTGlzdEhhc2hTZXQ6Oml0ZXJhdG9yIGRlc2NlbmRhbnQgPSBk ZXNjZW5kYW50U2V0LT5iZWdpbigpOyBkZXNjZW5kYW50ICE9IGVuZDsgKytkZXNjZW5kYW50KSB7 Ci0gICAgICAgICAgICBIYXNoU2V0PFJlbmRlckJsb2NrKj4qIGNvbnRhaW5lclNldCA9IGNvbnRh aW5lck1hcC0+Z2V0KCpkZXNjZW5kYW50KTsKLSAgICAgICAgICAgIEFTU0VSVChjb250YWluZXJT ZXQpOwotICAgICAgICAgICAgaWYgKCFjb250YWluZXJTZXQpCisgICAgICAgICAgICBUcmFja2Vk Q29udGFpbmVyTWFwOjppdGVyYXRvciBpdCA9IGNvbnRhaW5lck1hcC0+ZmluZCgqZGVzY2VuZGFu dCk7CisgICAgICAgICAgICBBU1NFUlQoaXQgIT0gY29udGFpbmVyTWFwLT5lbmQoKSk7CisgICAg ICAgICAgICBpZiAoaXQgPT0gY29udGFpbmVyTWFwLT5lbmQoKSkKICAgICAgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgICAgIEhhc2hTZXQ8UmVuZGVyQmxvY2sqPiogY29udGFpbmVyU2V0 ID0gaXQtPnZhbHVlLmdldCgpOwogICAgICAgICAgICAgQVNTRVJUKGNvbnRhaW5lclNldC0+Y29u dGFpbnMoYmxvY2spKTsKICAgICAgICAgICAgIGNvbnRhaW5lclNldC0+cmVtb3ZlKGJsb2NrKTsK LSAgICAgICAgICAgIGlmIChjb250YWluZXJTZXQtPmlzRW1wdHkoKSkgewotICAgICAgICAgICAg ICAgIGNvbnRhaW5lck1hcC0+cmVtb3ZlKCpkZXNjZW5kYW50KTsKLSAgICAgICAgICAgICAgICBk ZWxldGUgY29udGFpbmVyU2V0OwotICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKGNvbnRh aW5lclNldC0+aXNFbXB0eSgpKQorICAgICAgICAgICAgICAgIGNvbnRhaW5lck1hcC0+cmVtb3Zl KGl0KTsKICAgICAgICAgfQotICAgICAgICBkZWxldGUgZGVzY2VuZGFudFNldDsKICAgICB9CiB9 CiAKQEAgLTIyNCw3ICsyMjIsNyBAQCBSZW5kZXJCbG9jazo6flJlbmRlckJsb2NrKCkKICAgICAg ICAgZGVsZXRlQWxsVmFsdWVzKG1fZmxvYXRpbmdPYmplY3RzLT5zZXQoKSk7CiAgICAgCiAgICAg aWYgKGhhc0NvbHVtbnMoKSkKLSAgICAgICAgZGVsZXRlIGdDb2x1bW5JbmZvTWFwLT50YWtlKHRo aXMpOworICAgICAgICBnQ29sdW1uSW5mb01hcC0+dGFrZSh0aGlzKTsKIAogICAgIGlmIChnUGVy Y2VudEhlaWdodERlc2NlbmRhbnRzTWFwKQogICAgICAgICByZW1vdmVCbG9ja0Zyb21EZXNjZW5k YW50QW5kQ29udGFpbmVyTWFwcyh0aGlzLCBnUGVyY2VudEhlaWdodERlc2NlbmRhbnRzTWFwLCBn UGVyY2VudEhlaWdodENvbnRhaW5lck1hcCk7CkBAIC0xNzMxLDcgKzE3MjksNiBAQCB2b2lkIFJl bmRlckJsb2NrOjphZGRPdmVyZmxvd0Zyb21GbG9hdHMoKQogICAgICAgICBpZiAoci0+aXNEZXNj ZW5kYW50KCkpCiAgICAgICAgICAgICBhZGRPdmVyZmxvd0Zyb21DaGlsZChyLT5tX3JlbmRlcmVy LCBJbnRTaXplKHhQb3NpdGlvbkZvckZsb2F0SW5jbHVkaW5nTWFyZ2luKHIpLCB5UG9zaXRpb25G b3JGbG9hdEluY2x1ZGluZ01hcmdpbihyKSkpOwogICAgIH0KLSAgICByZXR1cm47CiB9CiAKIHZv aWQgUmVuZGVyQmxvY2s6OmFkZE92ZXJmbG93RnJvbVBvc2l0aW9uZWRPYmplY3RzKCkKQEAgLTMx ODMsNyArMzE4MCw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmFkZENvbnRpbnVhdGlvbldpdGhPdXRs aW5lKFJlbmRlcklubGluZSogZmxvdykKICAgICBMaXN0SGFzaFNldDxSZW5kZXJJbmxpbmUqPiog Y29udGludWF0aW9ucyA9IHRhYmxlLT5nZXQodGhpcyk7CiAgICAgaWYgKCFjb250aW51YXRpb25z KSB7CiAgICAgICAgIGNvbnRpbnVhdGlvbnMgPSBuZXcgTGlzdEhhc2hTZXQ8UmVuZGVySW5saW5l Kj47Ci0gICAgICAgIHRhYmxlLT5zZXQodGhpcywgY29udGludWF0aW9ucyk7CisgICAgICAgIHRh YmxlLT5zZXQodGhpcywgYWRvcHRQdHIoY29udGludWF0aW9ucykpOwogICAgIH0KICAgICAKICAg ICBjb250aW51YXRpb25zLT5hZGQoZmxvdyk7CkBAIC0zMjA4LDcgKzMyMDUsNyBAQCB2b2lkIFJl bmRlckJsb2NrOjpwYWludENvbnRpbnVhdGlvbk91dGxpbmVzKFBhaW50SW5mbyYgaW5mbywgY29u c3QgTGF5b3V0UG9pbnQmCiAgICAgaWYgKHRhYmxlLT5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVy bjsKICAgICAgICAgCi0gICAgTGlzdEhhc2hTZXQ8UmVuZGVySW5saW5lKj4qIGNvbnRpbnVhdGlv bnMgPSB0YWJsZS0+Z2V0KHRoaXMpOworICAgIE93blB0cjxMaXN0SGFzaFNldDxSZW5kZXJJbmxp bmUqPiA+IGNvbnRpbnVhdGlvbnMgPSB0YWJsZS0+dGFrZSh0aGlzKTsKICAgICBpZiAoIWNvbnRp bnVhdGlvbnMpCiAgICAgICAgIHJldHVybjsKIApAQCAtMzIyNCwxMCArMzIyMSw2IEBAIHZvaWQg UmVuZGVyQmxvY2s6OnBhaW50Q29udGludWF0aW9uT3V0bGluZXMoUGFpbnRJbmZvJiBpbmZvLCBj b25zdCBMYXlvdXRQb2ludCYKICAgICAgICAgQVNTRVJUKGJsb2NrKTsgICAKICAgICAgICAgZmxv dy0+cGFpbnRPdXRsaW5lKGluZm8uY29udGV4dCwgYWNjdW11bGF0ZWRQYWludE9mZnNldCk7CiAg ICAgfQotICAgIAotICAgIC8vIERlbGV0ZQotICAgIGRlbGV0ZSBjb250aW51YXRpb25zOwotICAg IHRhYmxlLT5yZW1vdmUodGhpcyk7CiB9CiAKIGJvb2wgUmVuZGVyQmxvY2s6OnNob3VsZFBhaW50 U2VsZWN0aW9uR2FwcygpIGNvbnN0CkBAIC0zNjU1LDcgKzM2NDgsNyBAQCB2b2lkIFJlbmRlckJs b2NrOjppbnNlcnRJbnRvVHJhY2tlZFJlbmRlcmVyTWFwcyhSZW5kZXJCb3gqIGRlc2NlbmRhbnQs IFRyYWNrZWREZQogICAgIFRyYWNrZWRSZW5kZXJlckxpc3RIYXNoU2V0KiBkZXNjZW5kYW50U2V0 ID0gZGVzY2VuZGFudHNNYXAtPmdldCh0aGlzKTsKICAgICBpZiAoIWRlc2NlbmRhbnRTZXQpIHsK ICAgICAgICAgZGVzY2VuZGFudFNldCA9IG5ldyBUcmFja2VkUmVuZGVyZXJMaXN0SGFzaFNldDsK LSAgICAgICAgZGVzY2VuZGFudHNNYXAtPnNldCh0aGlzLCBkZXNjZW5kYW50U2V0KTsKKyAgICAg ICAgZGVzY2VuZGFudHNNYXAtPnNldCh0aGlzLCBhZG9wdFB0cihkZXNjZW5kYW50U2V0KSk7CiAg ICAgfQogICAgIGJvb2wgYWRkZWQgPSBkZXNjZW5kYW50U2V0LT5hZGQoZGVzY2VuZGFudCkuaXNO ZXdFbnRyeTsKICAgICBpZiAoIWFkZGVkKSB7CkBAIC0zNjY3LDcgKzM2NjAsNyBAQCB2b2lkIFJl bmRlckJsb2NrOjppbnNlcnRJbnRvVHJhY2tlZFJlbmRlcmVyTWFwcyhSZW5kZXJCb3gqIGRlc2Nl bmRhbnQsIFRyYWNrZWREZQogICAgIEhhc2hTZXQ8UmVuZGVyQmxvY2sqPiogY29udGFpbmVyU2V0 ID0gY29udGFpbmVyTWFwLT5nZXQoZGVzY2VuZGFudCk7CiAgICAgaWYgKCFjb250YWluZXJTZXQp IHsKICAgICAgICAgY29udGFpbmVyU2V0ID0gbmV3IEhhc2hTZXQ8UmVuZGVyQmxvY2sqPjsKLSAg ICAgICAgY29udGFpbmVyTWFwLT5zZXQoZGVzY2VuZGFudCwgY29udGFpbmVyU2V0KTsKKyAgICAg ICAgY29udGFpbmVyTWFwLT5zZXQoZGVzY2VuZGFudCwgYWRvcHRQdHIoY29udGFpbmVyU2V0KSk7 CiAgICAgfQogICAgIEFTU0VSVCghY29udGFpbmVyU2V0LT5jb250YWlucyh0aGlzKSk7CiAgICAg Y29udGFpbmVyU2V0LT5hZGQodGhpcyk7CkBAIC0zNjc4LDcgKzM2NzEsNyBAQCB2b2lkIFJlbmRl ckJsb2NrOjpyZW1vdmVGcm9tVHJhY2tlZFJlbmRlcmVyTWFwcyhSZW5kZXJCb3gqIGRlc2NlbmRh bnQsIFRyYWNrZWREZQogICAgIGlmICghZGVzY2VuZGFudHNNYXApCiAgICAgICAgIHJldHVybjsK ICAgICAKLSAgICBIYXNoU2V0PFJlbmRlckJsb2NrKj4qIGNvbnRhaW5lclNldCA9IGNvbnRhaW5l ck1hcC0+dGFrZShkZXNjZW5kYW50KTsKKyAgICBPd25QdHI8SGFzaFNldDxSZW5kZXJCbG9jayo+ ID4gY29udGFpbmVyU2V0ID0gY29udGFpbmVyTWFwLT50YWtlKGRlc2NlbmRhbnQpOwogICAgIGlm ICghY29udGFpbmVyU2V0KQogICAgICAgICByZXR1cm47CiAgICAgCkBAIC0zNjkxLDE5ICszNjg0 LDE2IEBAIHZvaWQgUmVuZGVyQmxvY2s6OnJlbW92ZUZyb21UcmFja2VkUmVuZGVyZXJNYXBzKFJl bmRlckJveCogZGVzY2VuZGFudCwgVHJhY2tlZERlCiAgICAgICAgIC8vIHRoZWlyIGFuY2VzdG9y IGNoYWluIGJlZm9yZSBiZWluZyBtb3ZlZC4gU2VlIHdlYmtpdCBidWcgOTM3NjYuCiAgICAgICAg IC8vIEFTU0VSVChkZXNjZW5kYW50LT5pc0Rlc2NlbmRhbnRPZihjb250YWluZXIpKTsKIAotICAg ICAgICBUcmFja2VkUmVuZGVyZXJMaXN0SGFzaFNldCogZGVzY2VuZGFudFNldCA9IGRlc2NlbmRh bnRzTWFwLT5nZXQoY29udGFpbmVyKTsKLSAgICAgICAgQVNTRVJUKGRlc2NlbmRhbnRTZXQpOwot ICAgICAgICBpZiAoIWRlc2NlbmRhbnRTZXQpCisgICAgICAgIFRyYWNrZWREZXNjZW5kYW50c01h cDo6aXRlcmF0b3IgZGVzY2VuZGFudHNNYXBJdGVyYXRvciA9IGRlc2NlbmRhbnRzTWFwLT5maW5k KGNvbnRhaW5lcik7CisgICAgICAgIEFTU0VSVChkZXNjZW5kYW50c01hcEl0ZXJhdG9yICE9IGRl c2NlbmRhbnRzTWFwLT5lbmQoKSk7CisgICAgICAgIGlmIChkZXNjZW5kYW50c01hcEl0ZXJhdG9y ID09IGRlc2NlbmRhbnRzTWFwLT5lbmQoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAg ICBUcmFja2VkUmVuZGVyZXJMaXN0SGFzaFNldCogZGVzY2VuZGFudFNldCA9IGRlc2NlbmRhbnRz TWFwSXRlcmF0b3ItPnZhbHVlLmdldCgpOwogICAgICAgICBBU1NFUlQoZGVzY2VuZGFudFNldC0+ Y29udGFpbnMoZGVzY2VuZGFudCkpOwogICAgICAgICBkZXNjZW5kYW50U2V0LT5yZW1vdmUoZGVz Y2VuZGFudCk7Ci0gICAgICAgIGlmIChkZXNjZW5kYW50U2V0LT5pc0VtcHR5KCkpIHsKLSAgICAg ICAgICAgIGRlc2NlbmRhbnRzTWFwLT5yZW1vdmUoY29udGFpbmVyKTsKLSAgICAgICAgICAgIGRl bGV0ZSBkZXNjZW5kYW50U2V0OwotICAgICAgICB9CisgICAgICAgIGlmIChkZXNjZW5kYW50U2V0 LT5pc0VtcHR5KCkpCisgICAgICAgICAgICBkZXNjZW5kYW50c01hcC0+cmVtb3ZlKGRlc2NlbmRh bnRzTWFwSXRlcmF0b3IpOwogICAgIH0KLSAgICAKLSAgICBkZWxldGUgY29udGFpbmVyU2V0Owog fQogCiBUcmFja2VkUmVuZGVyZXJMaXN0SGFzaFNldCogUmVuZGVyQmxvY2s6OnBvc2l0aW9uZWRP YmplY3RzKCkgY29uc3QKQEAgLTUyMjEsNyArNTIxMSw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OnNl dERlc2lyZWRDb2x1bW5Db3VudEFuZFdpZHRoKGludCBjb3VudCwgTGF5b3V0VW5pdCB3aWR0aCkK ICAgICBib29sIGRlc3Ryb3lDb2x1bW5zID0gIXJlcXVpcmVzQ29sdW1ucyhjb3VudCk7CiAgICAg aWYgKGRlc3Ryb3lDb2x1bW5zKSB7CiAgICAgICAgIGlmIChoYXNDb2x1bW5zKCkpIHsKLSAgICAg ICAgICAgIGRlbGV0ZSBnQ29sdW1uSW5mb01hcC0+dGFrZSh0aGlzKTsKKyAgICAgICAgICAgIGdD b2x1bW5JbmZvTWFwLT50YWtlKHRoaXMpOwogICAgICAgICAgICAgc2V0SGFzQ29sdW1ucyhmYWxz ZSk7CiAgICAgICAgIH0KICAgICB9IGVsc2UgewpAQCAtNTIzMiw3ICs1MjIyLDcgQEAgdm9pZCBS ZW5kZXJCbG9jazo6c2V0RGVzaXJlZENvbHVtbkNvdW50QW5kV2lkdGgoaW50IGNvdW50LCBMYXlv dXRVbml0IHdpZHRoKQogICAgICAgICAgICAgaWYgKCFnQ29sdW1uSW5mb01hcCkKICAgICAgICAg ICAgICAgICBnQ29sdW1uSW5mb01hcCA9IG5ldyBDb2x1bW5JbmZvTWFwOwogICAgICAgICAgICAg aW5mbyA9IG5ldyBDb2x1bW5JbmZvOwotICAgICAgICAgICAgZ0NvbHVtbkluZm9NYXAtPmFkZCh0 aGlzLCBpbmZvKTsKKyAgICAgICAgICAgIGdDb2x1bW5JbmZvTWFwLT5hZGQodGhpcywgYWRvcHRQ dHIoaW5mbykpOwogICAgICAgICAgICAgc2V0SGFzQ29sdW1ucyh0cnVlKTsKICAgICAgICAgfQog ICAgICAgICBpbmZvLT5zZXREZXNpcmVkQ29sdW1uQ291bnQoY291bnQpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2suaAppbmRleCA5ZjAwODQ3N2JjNGMwYmQ5Yjg0MjI4MWJlODIw NGI2YzU4NzU2MGFjLi4wNTQ2MDhiMWZlN2JjNzQ3MTAwMDFhNTQyM2QyM2RiN2RjZjJmZmI3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaApAQCAtNjIsOCArNjIsOCBAQCB0 ZW1wbGF0ZSA8Y2xhc3MgSXRlcmF0b3I+IHN0cnVjdCBNaWRwb2ludFN0YXRlOwogdHlwZWRlZiBC aWRpUmVzb2x2ZXI8SW5saW5lSXRlcmF0b3IsIEJpZGlSdW4+IElubGluZUJpZGlSZXNvbHZlcjsK IHR5cGVkZWYgTWlkcG9pbnRTdGF0ZTxJbmxpbmVJdGVyYXRvcj4gTGluZU1pZHBvaW50U3RhdGU7 CiB0eXBlZGVmIFdURjo6TGlzdEhhc2hTZXQ8UmVuZGVyQm94KiwgMTY+IFRyYWNrZWRSZW5kZXJl ckxpc3RIYXNoU2V0OwotdHlwZWRlZiBXVEY6Okhhc2hNYXA8Y29uc3QgUmVuZGVyQmxvY2sqLCBU cmFja2VkUmVuZGVyZXJMaXN0SGFzaFNldCo+IFRyYWNrZWREZXNjZW5kYW50c01hcDsKLXR5cGVk ZWYgV1RGOjpIYXNoTWFwPGNvbnN0IFJlbmRlckJveCosIEhhc2hTZXQ8UmVuZGVyQmxvY2sqPio+ IFRyYWNrZWRDb250YWluZXJNYXA7Cit0eXBlZGVmIFdURjo6SGFzaE1hcDxjb25zdCBSZW5kZXJC bG9jayosIE93blB0cjxUcmFja2VkUmVuZGVyZXJMaXN0SGFzaFNldD4gPiBUcmFja2VkRGVzY2Vu ZGFudHNNYXA7Cit0eXBlZGVmIFdURjo6SGFzaE1hcDxjb25zdCBSZW5kZXJCb3gqLCBPd25QdHI8 SGFzaFNldDxSZW5kZXJCbG9jayo+ID4gPiBUcmFja2VkQ29udGFpbmVyTWFwOwogdHlwZWRlZiBW ZWN0b3I8V29yZE1lYXN1cmVtZW50LCA2ND4gV29yZE1lYXN1cmVtZW50czsKIAogZW51bSBDYXJl dFR5cGUgeyBDdXJzb3JDYXJldCwgRHJhZ0NhcmV0IH07Cg==