138558 2014-11-09 23:24:00 -0800 Use std::unique_ptr<>|std::make_unique_ptr in RenderThemeEfl::ThemePartCacheEntry::create() 2014-11-23 18:25:59 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 128007 138652 1 gyuyoung.kim gyuyoung.kim commit-queue fpizlo lucas.de.marchi oldest_to_newest 1047482 0 gyuyoung.kim 2014-11-09 23:24:00 -0800 SSIA 1047483 1 241279 gyuyoung.kim 2014-11-09 23:25:08 -0800 Created attachment 241279 Patch 1047484 2 241279 fpizlo 2014-11-09 23:55:15 -0800 Comment on attachment 241279 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=241279&action=review > Source/WebCore/platform/efl/RenderThemeEfl.cpp:246 > - ThemePartCacheEntry* entry = ThemePartCacheEntry::create(themePath(), type, size).leakPtr(); > + ThemePartCacheEntry* entry = ThemePartCacheEntry::create(themePath(), type, size).get(); get() isn't really the equivalent of get(). In particular, it seems that this will destroy ThemePartCacheEntry after this statement, leaving entry to be a dangling pointer. Can you look into this some more? 1047485 3 fpizlo 2014-11-09 23:55:40 -0800 (In reply to comment #2) > Comment on attachment 241279 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=241279&action=review > > > Source/WebCore/platform/efl/RenderThemeEfl.cpp:246 > > - ThemePartCacheEntry* entry = ThemePartCacheEntry::create(themePath(), type, size).leakPtr(); > > + ThemePartCacheEntry* entry = ThemePartCacheEntry::create(themePath(), type, size).get(); > > get() isn't really the equivalent of get(). Lol, meant to say: get() isn't really the equivalent of leakPtr(). > In particular, it seems that > this will destroy ThemePartCacheEntry after this statement, leaving entry to > be a dangling pointer. > > Can you look into this some more? 1047486 4 gyuyoung.kim 2014-11-09 23:57:22 -0800 (In reply to comment #2) > Comment on attachment 241279 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=241279&action=review > > > Source/WebCore/platform/efl/RenderThemeEfl.cpp:246 > > - ThemePartCacheEntry* entry = ThemePartCacheEntry::create(themePath(), type, size).leakPtr(); > > + ThemePartCacheEntry* entry = ThemePartCacheEntry::create(themePath(), type, size).get(); > > get() isn't really the equivalent of get(). In particular, it seems that > this will destroy ThemePartCacheEntry after this statement, leaving entry to > be a dangling pointer. > > Can you look into this some more? Ah, right. thank you for pointing it out. Let me fix it soon. 1047525 5 241287 gyuyoung.kim 2014-11-10 05:55:54 -0800 Created attachment 241287 WIP 1047771 6 241337 gyuyoung.kim 2014-11-10 23:03:29 -0800 Created attachment 241337 Patch 1047773 7 gyuyoung.kim 2014-11-10 23:07:09 -0800 Filip, latest patch fixes the leakPtr() removal. I removes original Eina_List with Vector<std::unique_ptr> because the Eina_List can't support std::unique_ptr. I wonder whether you can take a look this patch again. 1047835 8 241337 andersca 2014-11-11 06:21:42 -0800 Comment on attachment 241337 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=241337&action=review > Source/WebCore/platform/efl/RenderThemeEfl.cpp:270 > + size_t cacheSize = m_partCache.size(); > + for (size_t i = 0; i < cacheSize; ++i) > + m_partCache[i].reset(); I think you should do something like for (auto& part : m_partCache) part = nullptr; here instead. 1047859 9 241355 gyuyoung.kim 2014-11-11 09:03:30 -0800 Created attachment 241355 Patch for landing 1047877 10 241355 commit-queue 2014-11-11 09:53:34 -0800 Comment on attachment 241355 Patch for landing Clearing flags on attachment: 241355 Committed r175953: <http://trac.webkit.org/changeset/175953> 1047878 11 commit-queue 2014-11-11 09:53:38 -0800 All reviewed patches have been landed. Closing bug. 241279 2014-11-09 23:25:08 -0800 2014-11-10 05:55:48 -0800 Patch bug-138558-20141110162509.patch text/plain 4184 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1Nzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzY2ZTM1NzA5N2VjYTlm NzYxZGI3MGJkYTQ2MWY3ZTZmMTc5YjYwMS4uOTMwZTQ4YmI4OGFhYjRmZDY2OTY0MDM1YWNiNzNm ZjA1NzE1YmFmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTExLTA5ICBHeXV5 b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgVXNlIHN0ZDo6 dW5pcXVlX3B0cjw+fHN0ZDo6bWFrZV91bmlxdWVfcHRyIGluIFJlbmRlclRoZW1lRWZsOjpUaGVt ZVBhcnRDYWNoZUVudHJ5OjpjcmVhdGUoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTM4NTU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCByZW1vdmVzIFBhc3NPd25QdHIgYW5kIE93blB0 ciBpbiBSZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVFbnRyeTo6Y3JlYXRlKCkuCisgICAg ICAgIEl0IHdvdWxkIGJlIGdvb2QgaWYgd2UgYWxzbyByZW1vdmUgY3JlYXRlKCkgZmFjdG9yeSBm dW5jdGlvbiB0aG91Z2gsIGluIHRoaXMgY2FzZSwgdGhlIGNyZWF0ZSgpCisgICAgICAgIGZhY3Rv cnkgZnVuY3Rpb24gZG9lcyBtYW55IHdvcmtzIHRvIGNyZWF0ZSBhIFRoZW1lUGFydENhY2hlRW50 cnkgaW5zdGFuY2UuIFRodXMgdGhpcyBwYXRjaAorICAgICAgICBqdXN0IHJlcGxhY2VzIFBhc3NP d25QdHJ8T3duUHRyIHdpdGggc3RkOjp1bmlxdWVfcHRyPD4gYW5kIHN0ZDo6bWFrZV91bmlxdWU8 Pi4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZXMuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9lZmwvUmVuZGVyVGhlbWVFZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyVGhlbWVFZmw6OlRoZW1lUGFydENhY2hlRW50cnk6OmNyZWF0ZSk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJUaGVtZUVmbDo6Z2V0VGhlbWVQYXJ0RnJvbUNhY2hlKToKKyAgICAgICAg KiBwbGF0Zm9ybS9lZmwvUmVuZGVyVGhlbWVFZmwuaDoKKwogMjAxNC0xMS0wOSAgQ2hyaXMgRHVt ZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBhIG1vcmUgY29ycmVjdCB3YXkg dG8gY29tcGFyZSBmbG9hdGluZyBwb2ludCBudW1iZXJzIGFuZCB1c2UgaXQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9SZW5kZXJUaGVtZUVmbC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9lZmwvUmVuZGVyVGhlbWVFZmwuY3BwCmluZGV4IDlmZTY3ZDIyZmQ5 MmUyNmY3NTM4N2JiMmE0OTI0NzE1OTZjZDM4OTEuLjhmMjU2MGI5MDI2NjNkZDBmNDU3Y2YzZTcx NzFhY2NkNDZjMjA0NjMgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9S ZW5kZXJUaGVtZUVmbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1JlbmRl clRoZW1lRWZsLmNwcApAQCAtMTU2LDcgKzE1Niw3IEBAIHN0YXRpYyBib29sIGlzRm9ybUVsZW1l bnRUb29MYXJnZVRvRGlzcGxheShjb25zdCBJbnRTaXplJiBlbGVtZW50U2l6ZSkKICAgICByZXR1 cm4gZWxlbWVudFNpemUud2lkdGgoKSA+IG1heEVkamVEaW1lbnNpb24gfHwgZWxlbWVudFNpemUu aGVpZ2h0KCkgPiBtYXhFZGplRGltZW5zaW9uOwogfQogCi1QYXNzT3duUHRyPFJlbmRlclRoZW1l RWZsOjpUaGVtZVBhcnRDYWNoZUVudHJ5PiBSZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVF bnRyeTo6Y3JlYXRlKGNvbnN0IFN0cmluZyYgdGhlbWVQYXRoLCBGb3JtVHlwZSB0eXBlLCBjb25z dCBJbnRTaXplJiBzaXplKQorc3RkOjp1bmlxdWVfcHRyPFJlbmRlclRoZW1lRWZsOjpUaGVtZVBh cnRDYWNoZUVudHJ5PiBSZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVFbnRyeTo6Y3JlYXRl KGNvbnN0IFN0cmluZyYgdGhlbWVQYXRoLCBGb3JtVHlwZSB0eXBlLCBjb25zdCBJbnRTaXplJiBz aXplKQogewogICAgIEFTU0VSVCghdGhlbWVQYXRoLmlzRW1wdHkoKSk7CiAKQEAgLTE2NSw3ICsx NjUsNyBAQCBQYXNzT3duUHRyPFJlbmRlclRoZW1lRWZsOjpUaGVtZVBhcnRDYWNoZUVudHJ5PiBS ZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVFbgogICAgICAgICByZXR1cm4gbnVsbHB0cjsK ICAgICB9CiAKLSAgICBPd25QdHI8VGhlbWVQYXJ0Q2FjaGVFbnRyeT4gZW50cnkgPSBhZG9wdFB0 cihuZXcgVGhlbWVQYXJ0Q2FjaGVFbnRyeSk7CisgICAgYXV0byBlbnRyeSA9IHN0ZDo6bWFrZV91 bmlxdWU8VGhlbWVQYXJ0Q2FjaGVFbnRyeT4oKTsKIAogICAgIGVudHJ5LT5tX2NhbnZhcyA9IEVm bFVuaXF1ZVB0cjxFY29yZV9FdmFzPihlY29yZV9ldmFzX2J1ZmZlcl9uZXcoc2l6ZS53aWR0aCgp LCBzaXplLmhlaWdodCgpKSk7CiAgICAgaWYgKCFlbnRyeS0+Y2FudmFzKCkpIHsKQEAgLTE5Miw3 ICsxOTIsNyBAQCBQYXNzT3duUHRyPFJlbmRlclRoZW1lRWZsOjpUaGVtZVBhcnRDYWNoZUVudHJ5 PiBSZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVFbgogICAgIGVudHJ5LT50eXBlID0gdHlw ZTsKICAgICBlbnRyeS0+c2l6ZSA9IHNpemU7CiAKLSAgICByZXR1cm4gZW50cnkucmVsZWFzZSgp OworICAgIHJldHVybiBlbnRyeTsKIH0KIAogdm9pZCBSZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0 Q2FjaGVFbnRyeTo6cmV1c2UoY29uc3QgU3RyaW5nJiB0aGVtZVBhdGgsIEZvcm1UeXBlIG5ld1R5 cGUsIGNvbnN0IEludFNpemUmIG5ld1NpemUpCkBAIC0yNDMsNyArMjQzLDcgQEAgUmVuZGVyVGhl bWVFZmw6OlRoZW1lUGFydENhY2hlRW50cnkqIFJlbmRlclRoZW1lRWZsOjpnZXRUaGVtZVBhcnRG cm9tQ2FjaGUoRm9ybVQKICAgICB9CiAKICAgICBpZiAoZWluYV9saXN0X2NvdW50KG1fcGFydENh Y2hlKSA8IFJFTkRFUl9USEVNRV9FRkxfUEFSVF9DQUNIRV9NQVgpIHsKLSAgICAgICAgVGhlbWVQ YXJ0Q2FjaGVFbnRyeSogZW50cnkgPSBUaGVtZVBhcnRDYWNoZUVudHJ5OjpjcmVhdGUodGhlbWVQ YXRoKCksIHR5cGUsIHNpemUpLmxlYWtQdHIoKTsKKyAgICAgICAgVGhlbWVQYXJ0Q2FjaGVFbnRy eSogZW50cnkgPSBUaGVtZVBhcnRDYWNoZUVudHJ5OjpjcmVhdGUodGhlbWVQYXRoKCksIHR5cGUs IHNpemUpLmdldCgpOwogICAgICAgICBpZiAoZW50cnkpCiAgICAgICAgICAgICBtX3BhcnRDYWNo ZSA9IGVpbmFfbGlzdF9wcmVwZW5kKG1fcGFydENhY2hlLCBlbnRyeSk7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9SZW5kZXJUaGVtZUVmbC5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZWZsL1JlbmRlclRoZW1lRWZsLmgKaW5kZXggZjA3M2Q3MWEwOGYxOTI0 MzQ4YWVkMjBkN2ZhNWUzYTAzMWUzMmQ1ZC4uZjQ1ZDczODg3Yjc5NDZlZmRhNTE3ZDJlMWUwODAx YzA5MzA4MTk4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1JlbmRl clRoZW1lRWZsLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1JlbmRlclRoZW1l RWZsLmgKQEAgLTIyMyw3ICsyMjMsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgYXBwbHlQYXJ0RGVz Y3JpcHRpb24oRXZhc19PYmplY3QqLCBzdHJ1Y3QgVGhlbWVQYXJ0RGVzYyopOwogCiAgICAgc3Ry dWN0IFRoZW1lUGFydENhY2hlRW50cnkgewotICAgICAgICBzdGF0aWMgUGFzc093blB0cjxSZW5k ZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVFbnRyeT4gY3JlYXRlKGNvbnN0IFN0cmluZyYgdGhl bWVQYXRoLCBGb3JtVHlwZSwgY29uc3QgSW50U2l6ZSYpOworICAgICAgICBzdGF0aWMgc3RkOjp1 bmlxdWVfcHRyPFJlbmRlclRoZW1lRWZsOjpUaGVtZVBhcnRDYWNoZUVudHJ5PiBjcmVhdGUoY29u c3QgU3RyaW5nJiB0aGVtZVBhdGgsIEZvcm1UeXBlLCBjb25zdCBJbnRTaXplJik7CiAgICAgICAg IHZvaWQgcmV1c2UoY29uc3QgU3RyaW5nJiB0aGVtZVBhdGgsIEZvcm1UeXBlLCBjb25zdCBJbnRT aXplJik7CiAKICAgICAgICAgQUxXQVlTX0lOTElORSBFY29yZV9FdmFzKiBjYW52YXMoKSB7IHJl dHVybiBtX2NhbnZhcy5nZXQoKTsgfQo= 241287 2014-11-10 05:55:54 -0800 2014-11-10 23:01:53 -0800 WIP bug-138558-20141110225555.patch text/plain 7479 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1ODA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDcxMTFkZDIwODI5OTY0 M2M4NGM1MmRmMmUxZmE4NzI5OTk0MDA5Ny4uZDMzM2I5OWViNGM1ZThhNDFhOWQ0YjAzZjQxOTUz ZGNjZTM5YTAzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTExLTEwICBHeXV5 b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgVXNlIHN0ZDo6 dW5pcXVlX3B0cjw+fHN0ZDo6bWFrZV91bmlxdWVfcHRyIGluIFJlbmRlclRoZW1lRWZsOjpUaGVt ZVBhcnRDYWNoZUVudHJ5OjpjcmVhdGUoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTM4NTU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCByZW1vdmVzIFBhc3NPd25QdHIgYW5kIE93blB0 ciBpbiBSZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVFbnRyeTo6Y3JlYXRlKCkuCisgICAg ICAgIEl0IHdvdWxkIGJlIGdvb2QgaWYgd2UgYWxzbyByZW1vdmUgY3JlYXRlKCkgZmFjdG9yeSBm dW5jdGlvbiB0aG91Z2gsIGluIHRoaXMgY2FzZSwgdGhlIGNyZWF0ZSgpCisgICAgICAgIGZhY3Rv cnkgZnVuY3Rpb24gZG9lcyBtYW55IHdvcmtzIHRvIGNyZWF0ZSBhIFRoZW1lUGFydENhY2hlRW50 cnkgaW5zdGFuY2UuIFRodXMgdGhpcyBwYXRjaAorICAgICAgICBqdXN0IHJlcGxhY2VzIFBhc3NP d25QdHJ8T3duUHRyIHdpdGggc3RkOjp1bmlxdWVfcHRyPD4gYW5kIHN0ZDo6bWFrZV91bmlxdWU8 Pi4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZXMuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9lZmwvUmVuZGVyVGhlbWVFZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyVGhlbWVFZmw6OlRoZW1lUGFydENhY2hlRW50cnk6OmNyZWF0ZSk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJUaGVtZUVmbDo6Z2V0VGhlbWVQYXJ0RnJvbUNhY2hlKToKKyAgICAgICAg KiBwbGF0Zm9ybS9lZmwvUmVuZGVyVGhlbWVFZmwuaDoKKwogMjAxNC0xMS0wOSAgR3l1eW91bmcg S2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxdIFJlbW92ZSBH YW1lcGFkRGV2aWNlRWZsOjpjcmVhdGUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZWZsL1JlbmRlclRoZW1lRWZsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Vm bC9SZW5kZXJUaGVtZUVmbC5jcHAKaW5kZXggOWZlNjdkMjJmZDkyZTI2Zjc1Mzg3YmIyYTQ5MjQ3 MTU5NmNkMzg5MS4uYzIwZWEzY2FiMmJkYzMzNGE5NWRlYzg3Njk2MGZmMDJlMmE5ZWRkYSAxMDA3 NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1JlbmRlclRoZW1lRWZsLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUmVuZGVyVGhlbWVFZmwuY3BwCkBAIC0x NTYsNyArMTU2LDcgQEAgc3RhdGljIGJvb2wgaXNGb3JtRWxlbWVudFRvb0xhcmdlVG9EaXNwbGF5 KGNvbnN0IEludFNpemUmIGVsZW1lbnRTaXplKQogICAgIHJldHVybiBlbGVtZW50U2l6ZS53aWR0 aCgpID4gbWF4RWRqZURpbWVuc2lvbiB8fCBlbGVtZW50U2l6ZS5oZWlnaHQoKSA+IG1heEVkamVE aW1lbnNpb247CiB9CiAKLVBhc3NPd25QdHI8UmVuZGVyVGhlbWVFZmw6OlRoZW1lUGFydENhY2hl RW50cnk+IFJlbmRlclRoZW1lRWZsOjpUaGVtZVBhcnRDYWNoZUVudHJ5OjpjcmVhdGUoY29uc3Qg U3RyaW5nJiB0aGVtZVBhdGgsIEZvcm1UeXBlIHR5cGUsIGNvbnN0IEludFNpemUmIHNpemUpCitz dGQ6OnVuaXF1ZV9wdHI8UmVuZGVyVGhlbWVFZmw6OlRoZW1lUGFydENhY2hlRW50cnk+IFJlbmRl clRoZW1lRWZsOjpUaGVtZVBhcnRDYWNoZUVudHJ5OjpjcmVhdGUoY29uc3QgU3RyaW5nJiB0aGVt ZVBhdGgsIEZvcm1UeXBlIHR5cGUsIGNvbnN0IEludFNpemUmIHNpemUpCiB7CiAgICAgQVNTRVJU KCF0aGVtZVBhdGguaXNFbXB0eSgpKTsKIApAQCAtMTY1LDcgKzE2NSw3IEBAIFBhc3NPd25QdHI8 UmVuZGVyVGhlbWVFZmw6OlRoZW1lUGFydENhY2hlRW50cnk+IFJlbmRlclRoZW1lRWZsOjpUaGVt ZVBhcnRDYWNoZUVuCiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAotICAgIE93blB0 cjxUaGVtZVBhcnRDYWNoZUVudHJ5PiBlbnRyeSA9IGFkb3B0UHRyKG5ldyBUaGVtZVBhcnRDYWNo ZUVudHJ5KTsKKyAgICBhdXRvIGVudHJ5ID0gc3RkOjptYWtlX3VuaXF1ZTxUaGVtZVBhcnRDYWNo ZUVudHJ5PigpOwogCiAgICAgZW50cnktPm1fY2FudmFzID0gRWZsVW5pcXVlUHRyPEVjb3JlX0V2 YXM+KGVjb3JlX2V2YXNfYnVmZmVyX25ldyhzaXplLndpZHRoKCksIHNpemUuaGVpZ2h0KCkpKTsK ICAgICBpZiAoIWVudHJ5LT5jYW52YXMoKSkgewpAQCAtMTkyLDcgKzE5Miw3IEBAIFBhc3NPd25Q dHI8UmVuZGVyVGhlbWVFZmw6OlRoZW1lUGFydENhY2hlRW50cnk+IFJlbmRlclRoZW1lRWZsOjpU aGVtZVBhcnRDYWNoZUVuCiAgICAgZW50cnktPnR5cGUgPSB0eXBlOwogICAgIGVudHJ5LT5zaXpl ID0gc2l6ZTsKIAotICAgIHJldHVybiBlbnRyeS5yZWxlYXNlKCk7CisgICAgcmV0dXJuIGVudHJ5 OwogfQogCiB2b2lkIFJlbmRlclRoZW1lRWZsOjpUaGVtZVBhcnRDYWNoZUVudHJ5OjpyZXVzZShj b25zdCBTdHJpbmcmIHRoZW1lUGF0aCwgRm9ybVR5cGUgbmV3VHlwZSwgY29uc3QgSW50U2l6ZSYg bmV3U2l6ZSkKQEAgLTIyMiw1NCArMjIyLDQ5IEBAIHZvaWQgUmVuZGVyVGhlbWVFZmw6OlRoZW1l UGFydENhY2hlRW50cnk6OnJldXNlKGNvbnN0IFN0cmluZyYgdGhlbWVQYXRoLCBGb3JtVHlwCiAK IFJlbmRlclRoZW1lRWZsOjpUaGVtZVBhcnRDYWNoZUVudHJ5KiBSZW5kZXJUaGVtZUVmbDo6Z2V0 VGhlbWVQYXJ0RnJvbUNhY2hlKEZvcm1UeXBlIHR5cGUsIGNvbnN0IEludFNpemUmIHNpemUpCiB7 Ci0gICAgdm9pZCogZGF0YTsKLSAgICBFaW5hX0xpc3QqIG5vZGU7Ci0gICAgRWluYV9MaXN0KiBy ZXVzYWJsZU5vZGUgPSAwOworICAgIHNpemVfdCByZXVzYWJsZU5vZGVJbmRleCA9IDA7CiAKLSAg ICAvLyBMb29rIGZvciB0aGUgaXRlbSBpbiB0aGUgY2FjaGUuCi0gICAgRUlOQV9MSVNUX0ZPUkVB Q0gobV9wYXJ0Q2FjaGUsIG5vZGUsIGRhdGEpIHsKLSAgICAgICAgVGhlbWVQYXJ0Q2FjaGVFbnRy eSogY2FjaGVkRW50cnkgPSBzdGF0aWNfY2FzdDxUaGVtZVBhcnRDYWNoZUVudHJ5Kj4oZGF0YSk7 Ci0gICAgICAgIGlmIChjYWNoZWRFbnRyeS0+c2l6ZSA9PSBzaXplKSB7Ci0gICAgICAgICAgICBp ZiAoY2FjaGVkRW50cnktPnR5cGUgPT0gdHlwZSkgeworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgbV9wYXJ0Q2FjaGUuc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgVGhlbWVQYXJ0Q2FjaGVFbnRy eSogY2FuZGlkYXRlZEVudHJ5ID0gbV9wYXJ0Q2FjaGVbaV0uZ2V0KCk7CisgICAgICAgIGlmIChj YW5kaWRhdGVkRW50cnktPnNpemUgPT0gc2l6ZSkgeworICAgICAgICAgICAgaWYgKGNhbmRpZGF0 ZWRFbnRyeS0+dHlwZSA9PSB0eXBlKSB7CiAgICAgICAgICAgICAgICAgLy8gRm91bmQgdGhlIHJp Z2h0IGl0ZW0sIG1vdmUgaXQgdG8gdGhlIGhlYWQgb2YgdGhlIGxpc3QKICAgICAgICAgICAgICAg ICAvLyBhbmQgcmV0dXJuIGl0LgotICAgICAgICAgICAgICAgIG1fcGFydENhY2hlID0gZWluYV9s aXN0X3Byb21vdGVfbGlzdChtX3BhcnRDYWNoZSwgbm9kZSk7Ci0gICAgICAgICAgICAgICAgcmV0 dXJuIGNhY2hlZEVudHJ5OworICAgICAgICAgICAgICAgIG1fcGFydENhY2hlLmluc2VydCgwLCBX VEY6Om1vdmUobV9wYXJ0Q2FjaGVbaV0pKTsKKyAgICAgICAgICAgICAgICBtX3BhcnRDYWNoZS5y ZW1vdmUoaSk7CisgICAgICAgICAgICAgICAgcmV0dXJuIG1fcGFydENhY2hlLmZpcnN0KCkuZ2V0 KCk7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAvLyBXZSByZXVzZSBpbiBwcmlvcml0eSB0 aGUgbGFzdCBpdGVtIGluIHRoZSBsaXN0IHRoYXQgaGFzCi0gICAgICAgICAgICAvLyB0aGUgcmVx dWVzdGVkIHNpemUuCi0gICAgICAgICAgICByZXVzYWJsZU5vZGUgPSBub2RlOworICAgICAgICAg ICAgcmV1c2FibGVOb2RlSW5kZXggPSBpOwogICAgICAgICB9CiAgICAgfQogCi0gICAgaWYgKGVp bmFfbGlzdF9jb3VudChtX3BhcnRDYWNoZSkgPCBSRU5ERVJfVEhFTUVfRUZMX1BBUlRfQ0FDSEVf TUFYKSB7Ci0gICAgICAgIFRoZW1lUGFydENhY2hlRW50cnkqIGVudHJ5ID0gVGhlbWVQYXJ0Q2Fj aGVFbnRyeTo6Y3JlYXRlKHRoZW1lUGF0aCgpLCB0eXBlLCBzaXplKS5sZWFrUHRyKCk7CisgICAg aWYgKG1fcGFydENhY2hlLnNpemUoKSA8IFJFTkRFUl9USEVNRV9FRkxfUEFSVF9DQUNIRV9NQVgp IHsKKyAgICAgICAgYXV0byBlbnRyeSA9IFRoZW1lUGFydENhY2hlRW50cnk6OmNyZWF0ZSh0aGVt ZVBhdGgoKSwgdHlwZSwgc2l6ZSk7CiAgICAgICAgIGlmIChlbnRyeSkKLSAgICAgICAgICAgIG1f cGFydENhY2hlID0gZWluYV9saXN0X3ByZXBlbmQobV9wYXJ0Q2FjaGUsIGVudHJ5KTsKKyAgICAg ICAgICAgIG1fcGFydENhY2hlLmFwcGVuZChXVEY6Om1vdmUoZW50cnkpKTsKIAotICAgICAgICBy ZXR1cm4gZW50cnk7CisgICAgICAgIHJldHVybiBtX3BhcnRDYWNoZS5sYXN0KCkuZ2V0KCk7CiAg ICAgfQogCiAgICAgLy8gVGhlIGNhY2hlIGlzIGZ1bGwsIHJldXNlIHRoZSBsYXN0IGl0ZW0gd2Ug Zm91bmQgdGhhdCBoYWQgdGhlCiAgICAgLy8gcmVxdWVzdGVkIHNpemUgdG8gYXZvaWQgcmVzaXpp bmcuIElmIHRoZXJlIHdhcyBub25lLCByZXVzZQogICAgIC8vIHRoZSBsYXN0IGl0ZW0gb2YgdGhl IGxpc3QuCi0gICAgaWYgKCFyZXVzYWJsZU5vZGUpCi0gICAgICAgIHJldXNhYmxlTm9kZSA9IGVp bmFfbGlzdF9sYXN0KG1fcGFydENhY2hlKTsKKyAgICBpZiAoIXJldXNhYmxlTm9kZUluZGV4KQor ICAgICAgICByZXVzYWJsZU5vZGVJbmRleCA9IG1fcGFydENhY2hlLnNpemUoKTsKIAotICAgIFRo ZW1lUGFydENhY2hlRW50cnkqIHJldXNlZEVudHJ5ID0gc3RhdGljX2Nhc3Q8VGhlbWVQYXJ0Q2Fj aGVFbnRyeSo+KGVpbmFfbGlzdF9kYXRhX2dldChyZXVzYWJsZU5vZGUpKTsKKyAgICBUaGVtZVBh cnRDYWNoZUVudHJ5KiByZXVzZWRFbnRyeSA9IG1fcGFydENhY2hlW3JldXNhYmxlTm9kZUluZGV4 XS5nZXQoKTsKICAgICBBU1NFUlQocmV1c2VkRW50cnkpOwogICAgIHJldXNlZEVudHJ5LT5yZXVz ZSh0aGVtZVBhdGgoKSwgdHlwZSwgc2l6ZSk7Ci0gICAgbV9wYXJ0Q2FjaGUgPSBlaW5hX2xpc3Rf cHJvbW90ZV9saXN0KG1fcGFydENhY2hlLCByZXVzYWJsZU5vZGUpOworICAgIG1fcGFydENhY2hl Lmluc2VydCgwLCBXVEY6Om1vdmUobV9wYXJ0Q2FjaGVbcmV1c2FibGVOb2RlSW5kZXhdKSk7Cisg ICAgbV9wYXJ0Q2FjaGUucmVtb3ZlKHJldXNhYmxlTm9kZUluZGV4KTsKIAotICAgIHJldHVybiBy ZXVzZWRFbnRyeTsKKyAgICByZXR1cm4gbV9wYXJ0Q2FjaGUuZmlyc3QoKS5nZXQoKTsKIH0KIAog dm9pZCBSZW5kZXJUaGVtZUVmbDo6Y2xlYXJUaGVtZVBhcnRDYWNoZSgpCiB7Ci0gICAgdm9pZCog ZGF0YTsKLSAgICBFSU5BX0xJU1RfRlJFRShtX3BhcnRDYWNoZSwgZGF0YSkKLSAgICAgICAgZGVs ZXRlIHN0YXRpY19jYXN0PFRoZW1lUGFydENhY2hlRW50cnkqPihkYXRhKTsKLQorICAgIGZvciAo c2l6ZV90IGkgPSAwOyBpIDwgbV9wYXJ0Q2FjaGUuc2l6ZSgpOyArK2kpCisgICAgICAgIG1fcGFy dENhY2hlW2ldLnJlc2V0KCk7CiB9CiAKIHZvaWQgUmVuZGVyVGhlbWVFZmw6OmFwcGx5RWRqZVN0 YXRlRnJvbUZvcm0oRXZhc19PYmplY3QqIG9iamVjdCwgY29uc3QgQ29udHJvbFN0YXRlcyogc3Rh dGVzLCBib29sIGhhdmVCYWNrZ3JvdW5kKQpAQCAtNTkyLDcgKzU4Nyw2IEBAIFJlbmRlclRoZW1l RWZsOjpSZW5kZXJUaGVtZUVmbChQYWdlKiBwYWdlKQogICAgICwgbV9mb2N1c1JpbmdDb2xvcigz MiwgMzIsIDIyNCwgMjI0KQogICAgICwgbV9zbGlkZXJUaHVtYkNvbG9yKENvbG9yOjpkYXJrR3Jh eSkKICAgICAsIG1fc3VwcG9ydHNTZWxlY3Rpb25Gb3JlZ3JvdW5kQ29sb3IoZmFsc2UpCi0gICAg LCBtX3BhcnRDYWNoZSgwKQogewogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9lZmwvUmVuZGVyVGhlbWVFZmwuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9S ZW5kZXJUaGVtZUVmbC5oCmluZGV4IGYwNzNkNzFhMDhmMTkyNDM0OGFlZDIwZDdmYTVlM2EwMzFl MzJkNWQuLmZmZTQwOGI4ZWM5M2Y3NzQyYzk0MDgxZTg0YjMxYjkxMmZlMmJlZDUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9SZW5kZXJUaGVtZUVmbC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9SZW5kZXJUaGVtZUVmbC5oCkBAIC0yMjMsNyArMjIz LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGFwcGx5UGFydERlc2NyaXB0aW9uKEV2YXNfT2JqZWN0 Kiwgc3RydWN0IFRoZW1lUGFydERlc2MqKTsKIAogICAgIHN0cnVjdCBUaGVtZVBhcnRDYWNoZUVu dHJ5IHsKLSAgICAgICAgc3RhdGljIFBhc3NPd25QdHI8UmVuZGVyVGhlbWVFZmw6OlRoZW1lUGFy dENhY2hlRW50cnk+IGNyZWF0ZShjb25zdCBTdHJpbmcmIHRoZW1lUGF0aCwgRm9ybVR5cGUsIGNv bnN0IEludFNpemUmKTsKKyAgICAgICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJUaGVt ZUVmbDo6VGhlbWVQYXJ0Q2FjaGVFbnRyeT4gY3JlYXRlKGNvbnN0IFN0cmluZyYgdGhlbWVQYXRo LCBGb3JtVHlwZSwgY29uc3QgSW50U2l6ZSYpOwogICAgICAgICB2b2lkIHJldXNlKGNvbnN0IFN0 cmluZyYgdGhlbWVQYXRoLCBGb3JtVHlwZSwgY29uc3QgSW50U2l6ZSYpOwogCiAgICAgICAgIEFM V0FZU19JTkxJTkUgRWNvcmVfRXZhcyogY2FudmFzKCkgeyByZXR1cm4gbV9jYW52YXMuZ2V0KCk7 IH0KQEAgLTI0NSw3ICsyNDUsNyBAQCBwcml2YXRlOgogICAgIC8vIExpc3Qgb2YgVGhlbWVQYXJ0 Q2FjaGVFbnRyeSogc29ydGVkIHNvIHRoYXQgdGhlIG1vc3QgcmVjZW50bHkKICAgICAvLyB1c2Vk IGVudHJpZXMgY29tZSBmaXJzdC4gV2UgdXNlIGEgbGlzdCBmb3IgZWZmaWNpZW50IG1vdmluZwog ICAgIC8vIG9mIGl0ZW1zIHdpdGhpbiB0aGUgY29udGFpbmVyLgotICAgIEVpbmFfTGlzdCogbV9w YXJ0Q2FjaGU7CisgICAgVmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxUaGVtZVBhcnRDYWNoZUVudHJ5 Pj4gbV9wYXJ0Q2FjaGU7CiAKICAgICBUaGVtZVBhcnRDYWNoZUVudHJ5KiBnZXRUaGVtZVBhcnRG cm9tQ2FjaGUoRm9ybVR5cGUsIGNvbnN0IEludFNpemUmKTsKICAgICB2b2lkIGNsZWFyVGhlbWVQ YXJ0Q2FjaGUoKTsK 241337 2014-11-10 23:03:29 -0800 2014-11-11 09:03:22 -0800 Patch bug-138558-20141111160326.patch text/plain 8072 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1ODM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWFmNGM5OGE3ZDdhYmRk M2M5ZDExZDMzM2ZhMGNmYTcyMzVmYjg4Yy4uMTFjYmE3NTg2ZmM0NjA3MmU0OGYwOGUwYjVmZDA5 MmUyOWYxNjdmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE0LTExLTEwICBHeXV5 b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgVXNlIHN0ZDo6 dW5pcXVlX3B0cjw+fHN0ZDo6bWFrZV91bmlxdWVfcHRyIGluIFJlbmRlclRoZW1lRWZsOjpUaGVt ZVBhcnRDYWNoZUVudHJ5OjpjcmVhdGUoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTM4NTU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCByZW1vdmVzIFBhc3NPd25QdHIgYW5kIE93blB0 ciBpbiBSZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVFbnRyeTo6Y3JlYXRlKCkuCisgICAg ICAgIEl0IHdvdWxkIGJlIGdvb2QgaWYgd2UgYWxzbyByZW1vdmUgY3JlYXRlKCkgZmFjdG9yeSBm dW5jdGlvbiB0aG91Z2gsIGluIHRoaXMgY2FzZSwgaXQgaXMKKyAgICAgICAgYSBsaXR0bGUgaGFy ZCB0byByZW1vdmUgaXQgc2luY2UgdGhlIGNyZWF0ZSgpIGZhY3RvcnkgZnVuY3Rpb24gZG9lcyBt YW55IHdvcmtzIHRvIGNyZWF0ZQorICAgICAgICBhIFRoZW1lUGFydENhY2hlRW50cnkgaW5zdGFu Y2UuIFRodXMgdGhpcyBwYXRjaCBqdXN0IHJlcGxhY2VzIFBhc3NPd25QdHJ8T3duUHRyIHdpdGgK KyAgICAgICAgc3RkOjp1bmlxdWVfcHRyPD4gYW5kIHN0ZDo6bWFrZV91bmlxdWU8PiBpbiBSZW5k ZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVFbnRyeTo6Y3JlYXRlKCkuCisKKyAgICAgICAgQmVz aWRlcyB0aGUgdGhlbWUgZW50cmllcyBoYXZlIGJlZW4gbWFpbnRhaW5lZCBieSBFaW5hX0xpc3Qq LiBVbmZvcnR1bmF0ZWx5IGl0IGRvZXNuJ3Qgc3VwcG9ydAorICAgICAgICBzdGQ6OnVuaXF1ZV9w dHI8PiB5ZXQuIFRodXMgdGhlIEVpbmFfTGlzdCogc2hvdWxkIGJlIHJlcGxhY2VkIHdpdGggVmVj dG9yPHN0ZDo6dW5pcXVlX3B0cjw+PgorICAgICAgICBzbyB0aGF0IG1fcGFydENhY2hlIGhhcyBv d25zaGlwIG9mIGFsbCBFRkwgdGhlbWUgZW50cmllcy4gVGhpcyBwYXRjaCB0cmllcyB0byBrZWVw IG9yaWdpbmFsCisgICAgICAgIGNhY2hlIGFsZ29yaXRobSBiYXNlZCBvbiBWZWN0b3IgY2xhc3Mu CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2VzLgorCisgICAgICAg ICogcGxhdGZvcm0vZWZsL1JlbmRlclRoZW1lRWZsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRoZW1lRWZsOjpUaGVtZVBhcnRDYWNoZUVudHJ5OjpjcmVhdGUpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyVGhlbWVFZmw6OmdldFRoZW1lUGFydEZyb21DYWNoZSk6CisgICAgICAgICog cGxhdGZvcm0vZWZsL1JlbmRlclRoZW1lRWZsLmg6CisKIDIwMTQtMTEtMTAgIENocmlzIER1bWV6 ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgbnVsbCBj aGVjayBpbiBGcmFtZVNlbGVjdGlvbjo6bm9kZVdpbGxCZVJlbW92ZWQoKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1JlbmRlclRoZW1lRWZsLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2VmbC9SZW5kZXJUaGVtZUVmbC5jcHAKaW5kZXggOWZlNjdkMjJmZDky ZTI2Zjc1Mzg3YmIyYTQ5MjQ3MTU5NmNkMzg5MS4uOWJjMDRiZDllZmVkMzhkZTBjMmNlMmU1OTQ4 NzkxMzU1ZmRlY2EwOCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1Jl bmRlclRoZW1lRWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUmVuZGVy VGhlbWVFZmwuY3BwCkBAIC0xNTYsNyArMTU2LDcgQEAgc3RhdGljIGJvb2wgaXNGb3JtRWxlbWVu dFRvb0xhcmdlVG9EaXNwbGF5KGNvbnN0IEludFNpemUmIGVsZW1lbnRTaXplKQogICAgIHJldHVy biBlbGVtZW50U2l6ZS53aWR0aCgpID4gbWF4RWRqZURpbWVuc2lvbiB8fCBlbGVtZW50U2l6ZS5o ZWlnaHQoKSA+IG1heEVkamVEaW1lbnNpb247CiB9CiAKLVBhc3NPd25QdHI8UmVuZGVyVGhlbWVF Zmw6OlRoZW1lUGFydENhY2hlRW50cnk+IFJlbmRlclRoZW1lRWZsOjpUaGVtZVBhcnRDYWNoZUVu dHJ5OjpjcmVhdGUoY29uc3QgU3RyaW5nJiB0aGVtZVBhdGgsIEZvcm1UeXBlIHR5cGUsIGNvbnN0 IEludFNpemUmIHNpemUpCitzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyVGhlbWVFZmw6OlRoZW1lUGFy dENhY2hlRW50cnk+IFJlbmRlclRoZW1lRWZsOjpUaGVtZVBhcnRDYWNoZUVudHJ5OjpjcmVhdGUo Y29uc3QgU3RyaW5nJiB0aGVtZVBhdGgsIEZvcm1UeXBlIHR5cGUsIGNvbnN0IEludFNpemUmIHNp emUpCiB7CiAgICAgQVNTRVJUKCF0aGVtZVBhdGguaXNFbXB0eSgpKTsKIApAQCAtMTY1LDcgKzE2 NSw3IEBAIFBhc3NPd25QdHI8UmVuZGVyVGhlbWVFZmw6OlRoZW1lUGFydENhY2hlRW50cnk+IFJl bmRlclRoZW1lRWZsOjpUaGVtZVBhcnRDYWNoZUVuCiAgICAgICAgIHJldHVybiBudWxscHRyOwog ICAgIH0KIAotICAgIE93blB0cjxUaGVtZVBhcnRDYWNoZUVudHJ5PiBlbnRyeSA9IGFkb3B0UHRy KG5ldyBUaGVtZVBhcnRDYWNoZUVudHJ5KTsKKyAgICBhdXRvIGVudHJ5ID0gc3RkOjptYWtlX3Vu aXF1ZTxUaGVtZVBhcnRDYWNoZUVudHJ5PigpOwogCiAgICAgZW50cnktPm1fY2FudmFzID0gRWZs VW5pcXVlUHRyPEVjb3JlX0V2YXM+KGVjb3JlX2V2YXNfYnVmZmVyX25ldyhzaXplLndpZHRoKCks IHNpemUuaGVpZ2h0KCkpKTsKICAgICBpZiAoIWVudHJ5LT5jYW52YXMoKSkgewpAQCAtMTkyLDcg KzE5Miw3IEBAIFBhc3NPd25QdHI8UmVuZGVyVGhlbWVFZmw6OlRoZW1lUGFydENhY2hlRW50cnk+ IFJlbmRlclRoZW1lRWZsOjpUaGVtZVBhcnRDYWNoZUVuCiAgICAgZW50cnktPnR5cGUgPSB0eXBl OwogICAgIGVudHJ5LT5zaXplID0gc2l6ZTsKIAotICAgIHJldHVybiBlbnRyeS5yZWxlYXNlKCk7 CisgICAgcmV0dXJuIGVudHJ5OwogfQogCiB2b2lkIFJlbmRlclRoZW1lRWZsOjpUaGVtZVBhcnRD YWNoZUVudHJ5OjpyZXVzZShjb25zdCBTdHJpbmcmIHRoZW1lUGF0aCwgRm9ybVR5cGUgbmV3VHlw ZSwgY29uc3QgSW50U2l6ZSYgbmV3U2l6ZSkKQEAgLTIyMiw1NCArMjIyLDUyIEBAIHZvaWQgUmVu ZGVyVGhlbWVFZmw6OlRoZW1lUGFydENhY2hlRW50cnk6OnJldXNlKGNvbnN0IFN0cmluZyYgdGhl bWVQYXRoLCBGb3JtVHlwCiAKIFJlbmRlclRoZW1lRWZsOjpUaGVtZVBhcnRDYWNoZUVudHJ5KiBS ZW5kZXJUaGVtZUVmbDo6Z2V0VGhlbWVQYXJ0RnJvbUNhY2hlKEZvcm1UeXBlIHR5cGUsIGNvbnN0 IEludFNpemUmIHNpemUpCiB7Ci0gICAgdm9pZCogZGF0YTsKLSAgICBFaW5hX0xpc3QqIG5vZGU7 Ci0gICAgRWluYV9MaXN0KiByZXVzYWJsZU5vZGUgPSAwOworICAgIHNpemVfdCByZXVzYWJsZU5v ZGVJbmRleCA9IDA7CiAKLSAgICAvLyBMb29rIGZvciB0aGUgaXRlbSBpbiB0aGUgY2FjaGUuCi0g ICAgRUlOQV9MSVNUX0ZPUkVBQ0gobV9wYXJ0Q2FjaGUsIG5vZGUsIGRhdGEpIHsKLSAgICAgICAg VGhlbWVQYXJ0Q2FjaGVFbnRyeSogY2FjaGVkRW50cnkgPSBzdGF0aWNfY2FzdDxUaGVtZVBhcnRD YWNoZUVudHJ5Kj4oZGF0YSk7Ci0gICAgICAgIGlmIChjYWNoZWRFbnRyeS0+c2l6ZSA9PSBzaXpl KSB7Ci0gICAgICAgICAgICBpZiAoY2FjaGVkRW50cnktPnR5cGUgPT0gdHlwZSkgeworICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9wYXJ0Q2FjaGUuc2l6ZSgpOyArK2kpIHsKKyAgICAgICAg VGhlbWVQYXJ0Q2FjaGVFbnRyeSogY2FuZGlkYXRlZEVudHJ5ID0gbV9wYXJ0Q2FjaGVbaV0uZ2V0 KCk7CisgICAgICAgIGlmIChjYW5kaWRhdGVkRW50cnktPnNpemUgPT0gc2l6ZSkgeworICAgICAg ICAgICAgaWYgKGNhbmRpZGF0ZWRFbnRyeS0+dHlwZSA9PSB0eXBlKSB7CiAgICAgICAgICAgICAg ICAgLy8gRm91bmQgdGhlIHJpZ2h0IGl0ZW0sIG1vdmUgaXQgdG8gdGhlIGhlYWQgb2YgdGhlIGxp c3QKICAgICAgICAgICAgICAgICAvLyBhbmQgcmV0dXJuIGl0LgotICAgICAgICAgICAgICAgIG1f cGFydENhY2hlID0gZWluYV9saXN0X3Byb21vdGVfbGlzdChtX3BhcnRDYWNoZSwgbm9kZSk7Ci0g ICAgICAgICAgICAgICAgcmV0dXJuIGNhY2hlZEVudHJ5OworICAgICAgICAgICAgICAgIGF1dG8g dGVtcCA9IFdURjo6bW92ZShtX3BhcnRDYWNoZVtpXSk7CisgICAgICAgICAgICAgICAgbV9wYXJ0 Q2FjaGUucmVtb3ZlKGkpOworICAgICAgICAgICAgICAgIG1fcGFydENhY2hlLmluc2VydCgwLCBX VEY6Om1vdmUodGVtcCkpOworICAgICAgICAgICAgICAgIHJldHVybiBtX3BhcnRDYWNoZS5maXJz dCgpLmdldCgpOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgLy8gV2UgcmV1c2UgaW4gcHJp b3JpdHkgdGhlIGxhc3QgaXRlbSBpbiB0aGUgbGlzdCB0aGF0IGhhcwotICAgICAgICAgICAgLy8g dGhlIHJlcXVlc3RlZCBzaXplLgotICAgICAgICAgICAgcmV1c2FibGVOb2RlID0gbm9kZTsKKyAg ICAgICAgICAgIHJldXNhYmxlTm9kZUluZGV4ID0gaTsKICAgICAgICAgfQogICAgIH0KIAotICAg IGlmIChlaW5hX2xpc3RfY291bnQobV9wYXJ0Q2FjaGUpIDwgUkVOREVSX1RIRU1FX0VGTF9QQVJU X0NBQ0hFX01BWCkgewotICAgICAgICBUaGVtZVBhcnRDYWNoZUVudHJ5KiBlbnRyeSA9IFRoZW1l UGFydENhY2hlRW50cnk6OmNyZWF0ZSh0aGVtZVBhdGgoKSwgdHlwZSwgc2l6ZSkubGVha1B0cigp OworICAgIGlmIChtX3BhcnRDYWNoZS5zaXplKCkgPCBSRU5ERVJfVEhFTUVfRUZMX1BBUlRfQ0FD SEVfTUFYKSB7CisgICAgICAgIGF1dG8gZW50cnkgPSBUaGVtZVBhcnRDYWNoZUVudHJ5OjpjcmVh dGUodGhlbWVQYXRoKCksIHR5cGUsIHNpemUpOwogICAgICAgICBpZiAoZW50cnkpCi0gICAgICAg ICAgICBtX3BhcnRDYWNoZSA9IGVpbmFfbGlzdF9wcmVwZW5kKG1fcGFydENhY2hlLCBlbnRyeSk7 CisgICAgICAgICAgICBtX3BhcnRDYWNoZS5pbnNlcnQoMCwgV1RGOjptb3ZlKGVudHJ5KSk7CiAK LSAgICAgICAgcmV0dXJuIGVudHJ5OworICAgICAgICByZXR1cm4gbV9wYXJ0Q2FjaGUuZmlyc3Qo KS5nZXQoKTsKICAgICB9CiAKICAgICAvLyBUaGUgY2FjaGUgaXMgZnVsbCwgcmV1c2UgdGhlIGxh c3QgaXRlbSB3ZSBmb3VuZCB0aGF0IGhhZCB0aGUKICAgICAvLyByZXF1ZXN0ZWQgc2l6ZSB0byBh dm9pZCByZXNpemluZy4gSWYgdGhlcmUgd2FzIG5vbmUsIHJldXNlCiAgICAgLy8gdGhlIGxhc3Qg aXRlbSBvZiB0aGUgbGlzdC4KLSAgICBpZiAoIXJldXNhYmxlTm9kZSkKLSAgICAgICAgcmV1c2Fi bGVOb2RlID0gZWluYV9saXN0X2xhc3QobV9wYXJ0Q2FjaGUpOworICAgIGlmICghcmV1c2FibGVO b2RlSW5kZXgpCisgICAgICAgIHJldXNhYmxlTm9kZUluZGV4ID0gbV9wYXJ0Q2FjaGUuc2l6ZSgp OwogCi0gICAgVGhlbWVQYXJ0Q2FjaGVFbnRyeSogcmV1c2VkRW50cnkgPSBzdGF0aWNfY2FzdDxU aGVtZVBhcnRDYWNoZUVudHJ5Kj4oZWluYV9saXN0X2RhdGFfZ2V0KHJldXNhYmxlTm9kZSkpOwor ICAgIFRoZW1lUGFydENhY2hlRW50cnkqIHJldXNlZEVudHJ5ID0gbV9wYXJ0Q2FjaGVbcmV1c2Fi bGVOb2RlSW5kZXhdLmdldCgpOwogICAgIEFTU0VSVChyZXVzZWRFbnRyeSk7CiAgICAgcmV1c2Vk RW50cnktPnJldXNlKHRoZW1lUGF0aCgpLCB0eXBlLCBzaXplKTsKLSAgICBtX3BhcnRDYWNoZSA9 IGVpbmFfbGlzdF9wcm9tb3RlX2xpc3QobV9wYXJ0Q2FjaGUsIHJldXNhYmxlTm9kZSk7CisgICAg YXV0byB0ZW1wID0gV1RGOjptb3ZlKG1fcGFydENhY2hlW3JldXNhYmxlTm9kZUluZGV4XSk7Cisg ICAgbV9wYXJ0Q2FjaGUucmVtb3ZlKHJldXNhYmxlTm9kZUluZGV4KTsKKyAgICBtX3BhcnRDYWNo ZS5pbnNlcnQoMCwgV1RGOjptb3ZlKHRlbXApKTsKIAotICAgIHJldHVybiByZXVzZWRFbnRyeTsK KyAgICByZXR1cm4gbV9wYXJ0Q2FjaGUuZmlyc3QoKS5nZXQoKTsKIH0KIAogdm9pZCBSZW5kZXJU aGVtZUVmbDo6Y2xlYXJUaGVtZVBhcnRDYWNoZSgpCiB7Ci0gICAgdm9pZCogZGF0YTsKLSAgICBF SU5BX0xJU1RfRlJFRShtX3BhcnRDYWNoZSwgZGF0YSkKLSAgICAgICAgZGVsZXRlIHN0YXRpY19j YXN0PFRoZW1lUGFydENhY2hlRW50cnkqPihkYXRhKTsKLQorICAgIHNpemVfdCBjYWNoZVNpemUg PSBtX3BhcnRDYWNoZS5zaXplKCk7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjYWNoZVNp emU7ICsraSkKKyAgICAgICAgbV9wYXJ0Q2FjaGVbaV0ucmVzZXQoKTsKIH0KIAogdm9pZCBSZW5k ZXJUaGVtZUVmbDo6YXBwbHlFZGplU3RhdGVGcm9tRm9ybShFdmFzX09iamVjdCogb2JqZWN0LCBj b25zdCBDb250cm9sU3RhdGVzKiBzdGF0ZXMsIGJvb2wgaGF2ZUJhY2tncm91bmQpCkBAIC01OTIs NyArNTkwLDYgQEAgUmVuZGVyVGhlbWVFZmw6OlJlbmRlclRoZW1lRWZsKFBhZ2UqIHBhZ2UpCiAg ICAgLCBtX2ZvY3VzUmluZ0NvbG9yKDMyLCAzMiwgMjI0LCAyMjQpCiAgICAgLCBtX3NsaWRlclRo dW1iQ29sb3IoQ29sb3I6OmRhcmtHcmF5KQogICAgICwgbV9zdXBwb3J0c1NlbGVjdGlvbkZvcmVn cm91bmRDb2xvcihmYWxzZSkKLSAgICAsIG1fcGFydENhY2hlKDApCiB7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9SZW5kZXJUaGVtZUVmbC5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZWZsL1JlbmRlclRoZW1lRWZsLmgKaW5kZXggZjA3M2Q3MWEwOGYx OTI0MzQ4YWVkMjBkN2ZhNWUzYTAzMWUzMmQ1ZC4uZmZlNDA4YjhlYzkzZjc3NDJjOTQwODFlODRi MzFiOTEyZmUyYmVkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1Jl bmRlclRoZW1lRWZsLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1JlbmRlclRo ZW1lRWZsLmgKQEAgLTIyMyw3ICsyMjMsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgYXBwbHlQYXJ0 RGVzY3JpcHRpb24oRXZhc19PYmplY3QqLCBzdHJ1Y3QgVGhlbWVQYXJ0RGVzYyopOwogCiAgICAg c3RydWN0IFRoZW1lUGFydENhY2hlRW50cnkgewotICAgICAgICBzdGF0aWMgUGFzc093blB0cjxS ZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVFbnRyeT4gY3JlYXRlKGNvbnN0IFN0cmluZyYg dGhlbWVQYXRoLCBGb3JtVHlwZSwgY29uc3QgSW50U2l6ZSYpOworICAgICAgICBzdGF0aWMgc3Rk Ojp1bmlxdWVfcHRyPFJlbmRlclRoZW1lRWZsOjpUaGVtZVBhcnRDYWNoZUVudHJ5PiBjcmVhdGUo Y29uc3QgU3RyaW5nJiB0aGVtZVBhdGgsIEZvcm1UeXBlLCBjb25zdCBJbnRTaXplJik7CiAgICAg ICAgIHZvaWQgcmV1c2UoY29uc3QgU3RyaW5nJiB0aGVtZVBhdGgsIEZvcm1UeXBlLCBjb25zdCBJ bnRTaXplJik7CiAKICAgICAgICAgQUxXQVlTX0lOTElORSBFY29yZV9FdmFzKiBjYW52YXMoKSB7 IHJldHVybiBtX2NhbnZhcy5nZXQoKTsgfQpAQCAtMjQ1LDcgKzI0NSw3IEBAIHByaXZhdGU6CiAg ICAgLy8gTGlzdCBvZiBUaGVtZVBhcnRDYWNoZUVudHJ5KiBzb3J0ZWQgc28gdGhhdCB0aGUgbW9z dCByZWNlbnRseQogICAgIC8vIHVzZWQgZW50cmllcyBjb21lIGZpcnN0LiBXZSB1c2UgYSBsaXN0 IGZvciBlZmZpY2llbnQgbW92aW5nCiAgICAgLy8gb2YgaXRlbXMgd2l0aGluIHRoZSBjb250YWlu ZXIuCi0gICAgRWluYV9MaXN0KiBtX3BhcnRDYWNoZTsKKyAgICBWZWN0b3I8c3RkOjp1bmlxdWVf cHRyPFRoZW1lUGFydENhY2hlRW50cnk+PiBtX3BhcnRDYWNoZTsKIAogICAgIFRoZW1lUGFydENh Y2hlRW50cnkqIGdldFRoZW1lUGFydEZyb21DYWNoZShGb3JtVHlwZSwgY29uc3QgSW50U2l6ZSYp OwogICAgIHZvaWQgY2xlYXJUaGVtZVBhcnRDYWNoZSgpOwo= 241355 2014-11-11 09:03:30 -0800 2014-11-11 09:53:34 -0800 Patch for landing bug-138558-20141112020332.patch text/plain 8016 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1OTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzU2NzY0MDFkZjRlYzAw ZjViMWM3NDc0YWE5NzM5MTI3MDRhNjJjZC4uNDdlMmQ5ODdhYjk1MzFhZDM4Y2QyM2UxMTU2ODJi YzFiMDBjODdkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE0LTExLTExICBHeXV5 b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgVXNlIHN0ZDo6 dW5pcXVlX3B0cjw+fHN0ZDo6bWFrZV91bmlxdWVfcHRyIGluIFJlbmRlclRoZW1lRWZsOjpUaGVt ZVBhcnRDYWNoZUVudHJ5OjpjcmVhdGUoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTM4NTU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENh cmxzc29uLgorCisgICAgICAgIFRoaXMgcGF0Y2ggcmVtb3ZlcyBQYXNzT3duUHRyIGFuZCBPd25Q dHIgaW4gUmVuZGVyVGhlbWVFZmw6OlRoZW1lUGFydENhY2hlRW50cnk6OmNyZWF0ZSgpLgorICAg ICAgICBJdCB3b3VsZCBiZSBnb29kIGlmIHdlIGFsc28gcmVtb3ZlIGNyZWF0ZSgpIGZhY3Rvcnkg ZnVuY3Rpb24gdGhvdWdoLCBpbiB0aGlzIGNhc2UsIGl0IGlzCisgICAgICAgIGEgbGl0dGxlIGhh cmQgdG8gcmVtb3ZlIGl0IHNpbmNlIHRoZSBjcmVhdGUoKSBmYWN0b3J5IGZ1bmN0aW9uIGRvZXMg bWFueSB3b3JrcyB0byBjcmVhdGUKKyAgICAgICAgYSBUaGVtZVBhcnRDYWNoZUVudHJ5IGluc3Rh bmNlLiBUaHVzIHRoaXMgcGF0Y2gganVzdCByZXBsYWNlcyBQYXNzT3duUHRyfE93blB0ciB3aXRo CisgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjw+IGFuZCBzdGQ6Om1ha2VfdW5pcXVlPD4gaW4gUmVu ZGVyVGhlbWVFZmw6OlRoZW1lUGFydENhY2hlRW50cnk6OmNyZWF0ZSgpLgorCisgICAgICAgIEJl c2lkZXMgdGhlIHRoZW1lIGVudHJpZXMgaGF2ZSBiZWVuIG1haW50YWluZWQgYnkgRWluYV9MaXN0 Ki4gVW5mb3J0dW5hdGVseSBpdCBkb2Vzbid0IHN1cHBvcnQKKyAgICAgICAgc3RkOjp1bmlxdWVf cHRyPD4geWV0LiBUaHVzIHRoZSBFaW5hX0xpc3QqIHNob3VsZCBiZSByZXBsYWNlZCB3aXRoIFZl Y3RvcjxzdGQ6OnVuaXF1ZV9wdHI8Pj4KKyAgICAgICAgc28gdGhhdCBtX3BhcnRDYWNoZSBoYXMg b3duc2hpcCBvZiBhbGwgRUZMIHRoZW1lIGVudHJpZXMuIFRoaXMgcGF0Y2ggdHJpZXMgdG8ga2Vl cCBvcmlnaW5hbAorICAgICAgICBjYWNoZSBhbGdvcml0aG0gYmFzZWQgb24gVmVjdG9yIGNsYXNz LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gYmVoYXZpb3IgY2hhbmdlcy4KKworICAgICAg ICAqIHBsYXRmb3JtL2VmbC9SZW5kZXJUaGVtZUVmbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVFbnRyeTo6Y3JlYXRlKToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclRoZW1lRWZsOjpnZXRUaGVtZVBhcnRGcm9tQ2FjaGUpOgorICAgICAgICAq IHBsYXRmb3JtL2VmbC9SZW5kZXJUaGVtZUVmbC5oOgorCiAyMDE0LTExLTExICBZdXN1a2UgU3V6 dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgogCiAgICAgICAgIENTUzQgU2VsZWN0b3JzOiBB ZGQgbXVsdGlwbGUgcHNldWRvIGVsZW1lbnRzIHN1cHBvcnQgdG8gOm1hdGNoZXMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9SZW5kZXJUaGVtZUVmbC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUmVuZGVyVGhlbWVFZmwuY3BwCmluZGV4IDlmZTY3ZDIy ZmQ5MmUyNmY3NTM4N2JiMmE0OTI0NzE1OTZjZDM4OTEuLjNjNWQyMjc4MGFiZGNjNWZiYTJmMzNl ODM2MDY4NmJiMTg0MjY4OTEgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Vm bC9SZW5kZXJUaGVtZUVmbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1Jl bmRlclRoZW1lRWZsLmNwcApAQCAtMTU2LDcgKzE1Niw3IEBAIHN0YXRpYyBib29sIGlzRm9ybUVs ZW1lbnRUb29MYXJnZVRvRGlzcGxheShjb25zdCBJbnRTaXplJiBlbGVtZW50U2l6ZSkKICAgICBy ZXR1cm4gZWxlbWVudFNpemUud2lkdGgoKSA+IG1heEVkamVEaW1lbnNpb24gfHwgZWxlbWVudFNp emUuaGVpZ2h0KCkgPiBtYXhFZGplRGltZW5zaW9uOwogfQogCi1QYXNzT3duUHRyPFJlbmRlclRo ZW1lRWZsOjpUaGVtZVBhcnRDYWNoZUVudHJ5PiBSZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2Fj aGVFbnRyeTo6Y3JlYXRlKGNvbnN0IFN0cmluZyYgdGhlbWVQYXRoLCBGb3JtVHlwZSB0eXBlLCBj b25zdCBJbnRTaXplJiBzaXplKQorc3RkOjp1bmlxdWVfcHRyPFJlbmRlclRoZW1lRWZsOjpUaGVt ZVBhcnRDYWNoZUVudHJ5PiBSZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVFbnRyeTo6Y3Jl YXRlKGNvbnN0IFN0cmluZyYgdGhlbWVQYXRoLCBGb3JtVHlwZSB0eXBlLCBjb25zdCBJbnRTaXpl JiBzaXplKQogewogICAgIEFTU0VSVCghdGhlbWVQYXRoLmlzRW1wdHkoKSk7CiAKQEAgLTE2NSw3 ICsxNjUsNyBAQCBQYXNzT3duUHRyPFJlbmRlclRoZW1lRWZsOjpUaGVtZVBhcnRDYWNoZUVudHJ5 PiBSZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVFbgogICAgICAgICByZXR1cm4gbnVsbHB0 cjsKICAgICB9CiAKLSAgICBPd25QdHI8VGhlbWVQYXJ0Q2FjaGVFbnRyeT4gZW50cnkgPSBhZG9w dFB0cihuZXcgVGhlbWVQYXJ0Q2FjaGVFbnRyeSk7CisgICAgYXV0byBlbnRyeSA9IHN0ZDo6bWFr ZV91bmlxdWU8VGhlbWVQYXJ0Q2FjaGVFbnRyeT4oKTsKIAogICAgIGVudHJ5LT5tX2NhbnZhcyA9 IEVmbFVuaXF1ZVB0cjxFY29yZV9FdmFzPihlY29yZV9ldmFzX2J1ZmZlcl9uZXcoc2l6ZS53aWR0 aCgpLCBzaXplLmhlaWdodCgpKSk7CiAgICAgaWYgKCFlbnRyeS0+Y2FudmFzKCkpIHsKQEAgLTE5 Miw3ICsxOTIsNyBAQCBQYXNzT3duUHRyPFJlbmRlclRoZW1lRWZsOjpUaGVtZVBhcnRDYWNoZUVu dHJ5PiBSZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVFbgogICAgIGVudHJ5LT50eXBlID0g dHlwZTsKICAgICBlbnRyeS0+c2l6ZSA9IHNpemU7CiAKLSAgICByZXR1cm4gZW50cnkucmVsZWFz ZSgpOworICAgIHJldHVybiBlbnRyeTsKIH0KIAogdm9pZCBSZW5kZXJUaGVtZUVmbDo6VGhlbWVQ YXJ0Q2FjaGVFbnRyeTo6cmV1c2UoY29uc3QgU3RyaW5nJiB0aGVtZVBhdGgsIEZvcm1UeXBlIG5l d1R5cGUsIGNvbnN0IEludFNpemUmIG5ld1NpemUpCkBAIC0yMjIsNTQgKzIyMiw1MSBAQCB2b2lk IFJlbmRlclRoZW1lRWZsOjpUaGVtZVBhcnRDYWNoZUVudHJ5OjpyZXVzZShjb25zdCBTdHJpbmcm IHRoZW1lUGF0aCwgRm9ybVR5cAogCiBSZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVFbnRy eSogUmVuZGVyVGhlbWVFZmw6OmdldFRoZW1lUGFydEZyb21DYWNoZShGb3JtVHlwZSB0eXBlLCBj b25zdCBJbnRTaXplJiBzaXplKQogewotICAgIHZvaWQqIGRhdGE7Ci0gICAgRWluYV9MaXN0KiBu b2RlOwotICAgIEVpbmFfTGlzdCogcmV1c2FibGVOb2RlID0gMDsKKyAgICBzaXplX3QgcmV1c2Fi bGVOb2RlSW5kZXggPSAwOwogCi0gICAgLy8gTG9vayBmb3IgdGhlIGl0ZW0gaW4gdGhlIGNhY2hl LgotICAgIEVJTkFfTElTVF9GT1JFQUNIKG1fcGFydENhY2hlLCBub2RlLCBkYXRhKSB7Ci0gICAg ICAgIFRoZW1lUGFydENhY2hlRW50cnkqIGNhY2hlZEVudHJ5ID0gc3RhdGljX2Nhc3Q8VGhlbWVQ YXJ0Q2FjaGVFbnRyeSo+KGRhdGEpOwotICAgICAgICBpZiAoY2FjaGVkRW50cnktPnNpemUgPT0g c2l6ZSkgewotICAgICAgICAgICAgaWYgKGNhY2hlZEVudHJ5LT50eXBlID09IHR5cGUpIHsKKyAg ICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fcGFydENhY2hlLnNpemUoKTsgKytpKSB7CisgICAg ICAgIFRoZW1lUGFydENhY2hlRW50cnkqIGNhbmRpZGF0ZWRFbnRyeSA9IG1fcGFydENhY2hlW2ld LmdldCgpOworICAgICAgICBpZiAoY2FuZGlkYXRlZEVudHJ5LT5zaXplID09IHNpemUpIHsKKyAg ICAgICAgICAgIGlmIChjYW5kaWRhdGVkRW50cnktPnR5cGUgPT0gdHlwZSkgewogICAgICAgICAg ICAgICAgIC8vIEZvdW5kIHRoZSByaWdodCBpdGVtLCBtb3ZlIGl0IHRvIHRoZSBoZWFkIG9mIHRo ZSBsaXN0CiAgICAgICAgICAgICAgICAgLy8gYW5kIHJldHVybiBpdC4KLSAgICAgICAgICAgICAg ICBtX3BhcnRDYWNoZSA9IGVpbmFfbGlzdF9wcm9tb3RlX2xpc3QobV9wYXJ0Q2FjaGUsIG5vZGUp OwotICAgICAgICAgICAgICAgIHJldHVybiBjYWNoZWRFbnRyeTsKKyAgICAgICAgICAgICAgICBh dXRvIHRlbXAgPSBXVEY6Om1vdmUobV9wYXJ0Q2FjaGVbaV0pOworICAgICAgICAgICAgICAgIG1f cGFydENhY2hlLnJlbW92ZShpKTsKKyAgICAgICAgICAgICAgICBtX3BhcnRDYWNoZS5pbnNlcnQo MCwgV1RGOjptb3ZlKHRlbXApKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gbV9wYXJ0Q2FjaGUu Zmlyc3QoKS5nZXQoKTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIC8vIFdlIHJldXNlIGlu IHByaW9yaXR5IHRoZSBsYXN0IGl0ZW0gaW4gdGhlIGxpc3QgdGhhdCBoYXMKLSAgICAgICAgICAg IC8vIHRoZSByZXF1ZXN0ZWQgc2l6ZS4KLSAgICAgICAgICAgIHJldXNhYmxlTm9kZSA9IG5vZGU7 CisgICAgICAgICAgICByZXVzYWJsZU5vZGVJbmRleCA9IGk7CiAgICAgICAgIH0KICAgICB9CiAK LSAgICBpZiAoZWluYV9saXN0X2NvdW50KG1fcGFydENhY2hlKSA8IFJFTkRFUl9USEVNRV9FRkxf UEFSVF9DQUNIRV9NQVgpIHsKLSAgICAgICAgVGhlbWVQYXJ0Q2FjaGVFbnRyeSogZW50cnkgPSBU aGVtZVBhcnRDYWNoZUVudHJ5OjpjcmVhdGUodGhlbWVQYXRoKCksIHR5cGUsIHNpemUpLmxlYWtQ dHIoKTsKKyAgICBpZiAobV9wYXJ0Q2FjaGUuc2l6ZSgpIDwgUkVOREVSX1RIRU1FX0VGTF9QQVJU X0NBQ0hFX01BWCkgeworICAgICAgICBhdXRvIGVudHJ5ID0gVGhlbWVQYXJ0Q2FjaGVFbnRyeTo6 Y3JlYXRlKHRoZW1lUGF0aCgpLCB0eXBlLCBzaXplKTsKICAgICAgICAgaWYgKGVudHJ5KQotICAg ICAgICAgICAgbV9wYXJ0Q2FjaGUgPSBlaW5hX2xpc3RfcHJlcGVuZChtX3BhcnRDYWNoZSwgZW50 cnkpOworICAgICAgICAgICAgbV9wYXJ0Q2FjaGUuaW5zZXJ0KDAsIFdURjo6bW92ZShlbnRyeSkp OwogCi0gICAgICAgIHJldHVybiBlbnRyeTsKKyAgICAgICAgcmV0dXJuIG1fcGFydENhY2hlLmZp cnN0KCkuZ2V0KCk7CiAgICAgfQogCiAgICAgLy8gVGhlIGNhY2hlIGlzIGZ1bGwsIHJldXNlIHRo ZSBsYXN0IGl0ZW0gd2UgZm91bmQgdGhhdCBoYWQgdGhlCiAgICAgLy8gcmVxdWVzdGVkIHNpemUg dG8gYXZvaWQgcmVzaXppbmcuIElmIHRoZXJlIHdhcyBub25lLCByZXVzZQogICAgIC8vIHRoZSBs YXN0IGl0ZW0gb2YgdGhlIGxpc3QuCi0gICAgaWYgKCFyZXVzYWJsZU5vZGUpCi0gICAgICAgIHJl dXNhYmxlTm9kZSA9IGVpbmFfbGlzdF9sYXN0KG1fcGFydENhY2hlKTsKKyAgICBpZiAoIXJldXNh YmxlTm9kZUluZGV4KQorICAgICAgICByZXVzYWJsZU5vZGVJbmRleCA9IG1fcGFydENhY2hlLnNp emUoKTsKIAotICAgIFRoZW1lUGFydENhY2hlRW50cnkqIHJldXNlZEVudHJ5ID0gc3RhdGljX2Nh c3Q8VGhlbWVQYXJ0Q2FjaGVFbnRyeSo+KGVpbmFfbGlzdF9kYXRhX2dldChyZXVzYWJsZU5vZGUp KTsKKyAgICBUaGVtZVBhcnRDYWNoZUVudHJ5KiByZXVzZWRFbnRyeSA9IG1fcGFydENhY2hlW3Jl dXNhYmxlTm9kZUluZGV4XS5nZXQoKTsKICAgICBBU1NFUlQocmV1c2VkRW50cnkpOwogICAgIHJl dXNlZEVudHJ5LT5yZXVzZSh0aGVtZVBhdGgoKSwgdHlwZSwgc2l6ZSk7Ci0gICAgbV9wYXJ0Q2Fj aGUgPSBlaW5hX2xpc3RfcHJvbW90ZV9saXN0KG1fcGFydENhY2hlLCByZXVzYWJsZU5vZGUpOwor ICAgIGF1dG8gdGVtcCA9IFdURjo6bW92ZShtX3BhcnRDYWNoZVtyZXVzYWJsZU5vZGVJbmRleF0p OworICAgIG1fcGFydENhY2hlLnJlbW92ZShyZXVzYWJsZU5vZGVJbmRleCk7CisgICAgbV9wYXJ0 Q2FjaGUuaW5zZXJ0KDAsIFdURjo6bW92ZSh0ZW1wKSk7CiAKLSAgICByZXR1cm4gcmV1c2VkRW50 cnk7CisgICAgcmV0dXJuIG1fcGFydENhY2hlLmZpcnN0KCkuZ2V0KCk7CiB9CiAKIHZvaWQgUmVu ZGVyVGhlbWVFZmw6OmNsZWFyVGhlbWVQYXJ0Q2FjaGUoKQogewotICAgIHZvaWQqIGRhdGE7Ci0g ICAgRUlOQV9MSVNUX0ZSRUUobV9wYXJ0Q2FjaGUsIGRhdGEpCi0gICAgICAgIGRlbGV0ZSBzdGF0 aWNfY2FzdDxUaGVtZVBhcnRDYWNoZUVudHJ5Kj4oZGF0YSk7Ci0KKyAgICBmb3IgKGF1dG8mIHBh cnQgOiBtX3BhcnRDYWNoZSkKKyAgICAgICAgcGFydCA9IG51bGxwdHI7CiB9CiAKIHZvaWQgUmVu ZGVyVGhlbWVFZmw6OmFwcGx5RWRqZVN0YXRlRnJvbUZvcm0oRXZhc19PYmplY3QqIG9iamVjdCwg Y29uc3QgQ29udHJvbFN0YXRlcyogc3RhdGVzLCBib29sIGhhdmVCYWNrZ3JvdW5kKQpAQCAtNTky LDcgKzU4OSw2IEBAIFJlbmRlclRoZW1lRWZsOjpSZW5kZXJUaGVtZUVmbChQYWdlKiBwYWdlKQog ICAgICwgbV9mb2N1c1JpbmdDb2xvcigzMiwgMzIsIDIyNCwgMjI0KQogICAgICwgbV9zbGlkZXJU aHVtYkNvbG9yKENvbG9yOjpkYXJrR3JheSkKICAgICAsIG1fc3VwcG9ydHNTZWxlY3Rpb25Gb3Jl Z3JvdW5kQ29sb3IoZmFsc2UpCi0gICAgLCBtX3BhcnRDYWNoZSgwKQogewogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUmVuZGVyVGhlbWVFZmwuaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9SZW5kZXJUaGVtZUVmbC5oCmluZGV4IGYwNzNkNzFhMDhm MTkyNDM0OGFlZDIwZDdmYTVlM2EwMzFlMzJkNWQuLmZmZTQwOGI4ZWM5M2Y3NzQyYzk0MDgxZTg0 YjMxYjkxMmZlMmJlZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9S ZW5kZXJUaGVtZUVmbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9SZW5kZXJU aGVtZUVmbC5oCkBAIC0yMjMsNyArMjIzLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGFwcGx5UGFy dERlc2NyaXB0aW9uKEV2YXNfT2JqZWN0Kiwgc3RydWN0IFRoZW1lUGFydERlc2MqKTsKIAogICAg IHN0cnVjdCBUaGVtZVBhcnRDYWNoZUVudHJ5IHsKLSAgICAgICAgc3RhdGljIFBhc3NPd25QdHI8 UmVuZGVyVGhlbWVFZmw6OlRoZW1lUGFydENhY2hlRW50cnk+IGNyZWF0ZShjb25zdCBTdHJpbmcm IHRoZW1lUGF0aCwgRm9ybVR5cGUsIGNvbnN0IEludFNpemUmKTsKKyAgICAgICAgc3RhdGljIHN0 ZDo6dW5pcXVlX3B0cjxSZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVFbnRyeT4gY3JlYXRl KGNvbnN0IFN0cmluZyYgdGhlbWVQYXRoLCBGb3JtVHlwZSwgY29uc3QgSW50U2l6ZSYpOwogICAg ICAgICB2b2lkIHJldXNlKGNvbnN0IFN0cmluZyYgdGhlbWVQYXRoLCBGb3JtVHlwZSwgY29uc3Qg SW50U2l6ZSYpOwogCiAgICAgICAgIEFMV0FZU19JTkxJTkUgRWNvcmVfRXZhcyogY2FudmFzKCkg eyByZXR1cm4gbV9jYW52YXMuZ2V0KCk7IH0KQEAgLTI0NSw3ICsyNDUsNyBAQCBwcml2YXRlOgog ICAgIC8vIExpc3Qgb2YgVGhlbWVQYXJ0Q2FjaGVFbnRyeSogc29ydGVkIHNvIHRoYXQgdGhlIG1v c3QgcmVjZW50bHkKICAgICAvLyB1c2VkIGVudHJpZXMgY29tZSBmaXJzdC4gV2UgdXNlIGEgbGlz dCBmb3IgZWZmaWNpZW50IG1vdmluZwogICAgIC8vIG9mIGl0ZW1zIHdpdGhpbiB0aGUgY29udGFp bmVyLgotICAgIEVpbmFfTGlzdCogbV9wYXJ0Q2FjaGU7CisgICAgVmVjdG9yPHN0ZDo6dW5pcXVl X3B0cjxUaGVtZVBhcnRDYWNoZUVudHJ5Pj4gbV9wYXJ0Q2FjaGU7CiAKICAgICBUaGVtZVBhcnRD YWNoZUVudHJ5KiBnZXRUaGVtZVBhcnRGcm9tQ2FjaGUoRm9ybVR5cGUsIGNvbnN0IEludFNpemUm KTsKICAgICB2b2lkIGNsZWFyVGhlbWVQYXJ0Q2FjaGUoKTsK