118297 2013-07-02 05:29:53 -0700 [ATK] Leak: leaks in AccessibilityUIElement 2013-07-02 09:51:35 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 116317 0 brian.holt webkit-unassigned cdumez commit-queue eflews.bot gyuyoung.kim oldest_to_newest 905363 0 brian.holt 2013-07-02 05:29:53 -0700 In Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp: Leak found using the "--leak" option in the Gtk port: { <insert_a_suppression_name_here> Memcheck:Leak fun:malloc fun:g_malloc fun:g_strdup fun:_ZN22AccessibilityUIElement11stringValueEv fun:_ZL22getStringValueCallbackPK15OpaqueJSContextP13OpaqueJSValueP14OpaqueJSStringPPKS2_ fun:_ZN3JSC16JSCallbackObjectINS_20JSDestructibleObjectEE14getStaticValueEPNS_9ExecStateENS_12PropertyNameE fun:_ZN3JSC16JSCallbackObjectINS_20JSDestructibleObjectEE18getOwnPropertySlotEPNS_6JSCellEPNS_9ExecStateENS_12PropertyNameERNS_12PropertySlotE fun:llint_slow_path_get_by_id obj:/home/likewise-open/SERILOCAL/brian.holt/Code/gnome3/WebKit/WebKitBuild/Release/.libs/libjavascriptcoregtk-3.0.so.0.14.1 fun:_ZN3JSC11Interpreter7executeEPNS_17ProgramExecutableEPNS_9ExecStateEPNS_8JSObjectE fun:_ZN3JSC8evaluateEPNS_9ExecStateERKNS_10SourceCodeENS_7JSValueEPS5_ fun:_ZN7WebCore16ScriptController15evaluateInWorldERKNS_16ScriptSourceCodeEPNS_15DOMWrapperWorldE fun:_ZN7WebCore16ScriptController8evaluateERKNS_16ScriptSourceCodeE fun:_ZN7WebCore13ScriptElement13executeScriptERKNS_16ScriptSourceCodeE fun:_ZN7WebCore13ScriptElement13prepareScriptERKN3WTF12TextPositionENS0_17LegacyTypeSupportE fun:_ZN7WebCore16HTMLScriptRunner9runScriptEPNS_7ElementERKN3WTF12TextPositionE fun:_ZN7WebCore16HTMLScriptRunner7executeEN3WTF10PassRefPtrINS_7ElementEEERKNS1_12TextPositionE fun:_ZN7WebCore18HTMLDocumentParser30runScriptsForPausedTreeBuilderEv fun:_ZN7WebCore18HTMLDocumentParser16canTakeNextTokenENS0_15SynchronousModeERNS_11PumpSessionE fun:_ZN7WebCore18HTMLDocumentParser13pumpTokenizerENS0_15SynchronousModeE fun:_ZN7WebCore18HTMLDocumentParser33resumeParsingAfterScriptExecutionEv fun:_ZN7WebCore18HTMLDocumentParser14notifyFinishedEPNS_14CachedResourceE } { <insert_a_suppression_name_here> Memcheck:Leak fun:malloc fun:g_malloc fun:g_slice_alloc fun:g_slist_prepend fun:_ZL29webkitAccessibleGetAttributesP10_AtkObject fun:_ZN22AccessibilityUIElement13allAttributesEv fun:_ZL21allAttributesCallbackPK15OpaqueJSContextP13OpaqueJSValueS3_mPKPKS2_PS5_ fun:_ZN3JSC18JSCallbackFunction4callEPNS_9ExecStateE fun:_ZN3JSC5LLIntL14handleHostCallEPNS_9ExecStateEPNS_11InstructionENS_7JSValueENS_22CodeSpecializationKindE fun:llint_slow_path_call obj:/home/likewise-open/SERILOCAL/brian.holt/Code/gnome3/WebKit/WebKitBuild/Release/.libs/libjavascriptcoregtk-3.0.so.0.14.1 fun:_ZN3JSC11Interpreter7executeEPNS_14EvalExecutableEPNS_9ExecStateENS_7JSValueEPNS_7JSScopeE fun:_ZN3JSC4evalEPNS_9ExecStateE fun:llint_slow_path_call_eval obj:/home/likewise-open/SERILOCAL/brian.holt/Code/gnome3/WebKit/WebKitBuild/Release/.libs/libjavascriptcoregtk-3.0.so.0.14.1 fun:_ZN3JSC11Interpreter7executeEPNS_17ProgramExecutableEPNS_9ExecStateEPNS_8JSObjectE fun:_ZN3JSC8evaluateEPNS_9ExecStateERKNS_10SourceCodeENS_7JSValueEPS5_ fun:_ZN7WebCore16ScriptController15evaluateInWorldERKNS_16ScriptSourceCodeEPNS_15DOMWrapperWorldE fun:_ZN7WebCore16ScriptController8evaluateERKNS_16ScriptSourceCodeE fun:_ZN7WebCore13ScriptElement13executeScriptERKNS_16ScriptSourceCodeE fun:_ZN7WebCore13ScriptElement13prepareScriptERKN3WTF12TextPositionENS0_17LegacyTypeSupportE fun:_ZN7WebCore16HTMLScriptRunner9runScriptEPNS_7ElementERKN3WTF12TextPositionE } { <insert_a_suppression_name_here> Memcheck:Leak fun:malloc fun:g_malloc fun:g_strdup fun:_ZL27webkitAccessibleTextGetTextP8_AtkTextii fun:_ZL23webkitAccessibleGetNameP10_AtkObject fun:_ZN22AccessibilityUIElement5titleEv fun:_ZL16getTitleCallbackPK15OpaqueJSContextP13OpaqueJSValueP14OpaqueJSStringPPKS2_ fun:_ZN3JSC16JSCallbackObjectINS_20JSDestructibleObjectEE14getStaticValueEPNS_9ExecStateENS_12PropertyNameE fun:_ZN3JSC16JSCallbackObjectINS_20JSDestructibleObjectEE18getOwnPropertySlotEPNS_6JSCellEPNS_9ExecStateENS_12PropertyNameERNS_12PropertySlotE fun:llint_slow_path_get_by_id obj:/home/likewise-open/SERILOCAL/brian.holt/Code/gnome3/WebKit/WebKitBuild/Release/.libs/libjavascriptcoregtk-3.0.so.0.14.1 fun:_ZN3JSC11Interpreter7executeEPNS_14EvalExecutableEPNS_9ExecStateENS_7JSValueEPNS_7JSScopeE fun:_ZN3JSC4evalEPNS_9ExecStateE fun:llint_slow_path_call_eval obj:/home/likewise-open/SERILOCAL/brian.holt/Code/gnome3/WebKit/WebKitBuild/Release/.libs/libjavascriptcoregtk-3.0.so.0.14.1 fun:_ZN3JSC11Interpreter7executeEPNS_17ProgramExecutableEPNS_9ExecStateEPNS_8JSObjectE fun:_ZN3JSC8evaluateEPNS_9ExecStateERKNS_10SourceCodeENS_7JSValueEPS5_ fun:_ZN7WebCore16ScriptController15evaluateInWorldERKNS_16ScriptSourceCodeEPNS_15DOMWrapperWorldE fun:_ZN7WebCore16ScriptController20executeScriptInWorldEPNS_15DOMWrapperWorldERKN3WTF6StringEb fun:_ZN7WebCore15ScheduledAction7executeEPNS_8DocumentE fun:_ZN7WebCore8DOMTimer5firedEv fun:_ZN7WebCore12ThreadTimers24sharedTimerFiredInternalEv } 905391 1 205903 brian.holt 2013-07-02 06:31:18 -0700 Created attachment 205903 Patch Fix for 2 of the 3 leaks 905393 2 205903 eflews.bot 2013-07-02 06:35:30 -0700 Comment on attachment 205903 Patch Attachment 205903 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/1019110 905394 3 brian.holt 2013-07-02 06:36:37 -0700 The proposed patch addresses the first two leaks. The final leak Memcheck:Leak fun:malloc fun:g_malloc fun:g_strdup fun:_ZL27webkitAccessibleTextGetTextP8_AtkTextii fun:_ZL23webkitAccessibleGetNameP10_AtkObject fun:_ZN22AccessibilityUIElement5titleEv will not be addressed in this bug because it requires a wider change to the Atk object caching mechanism that is used by the implementation of the Atk interface to return const pointers (e.g. const gchar*). A new bug will be raised. 905397 4 205904 brian.holt 2013-07-02 06:38:31 -0700 Created attachment 205904 Revised patch 905398 5 205904 cdumez 2013-07-02 06:41:46 -0700 Comment on attachment 205904 Revised patch View in context: https://bugs.webkit.org/attachment.cgi?id=205904&action=review > Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:316 > + GOwnPtr<char> attributeData(attributeString.get()); This does not look right. > Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:424 > + GOwnPtr<gchar> text(atk_text_get_text(ATK_TEXT(m_element), 0, -1)); This part looks OK though. 905399 6 brian.holt 2013-07-02 06:46:14 -0700 (In reply to comment #5) > (From update of attachment 205904 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=205904&action=review > > > Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:316 > > + GOwnPtr<char> attributeData(attributeString.get()); > > This does not look right. Absolutely correct, don't know how that slipped past. > > > Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:424 > > + GOwnPtr<gchar> text(atk_text_get_text(ATK_TEXT(m_element), 0, -1)); > > This part looks OK though. 905419 7 205904 cdumez 2013-07-02 07:31:29 -0700 Comment on attachment 205904 Revised patch View in context: https://bugs.webkit.org/attachment.cgi?id=205904&action=review > Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:315 > + GOwnPtr<char> attributeString(attributeSetToString(atk_object_get_attributes(ATK_OBJECT(m_element)))); There is indeed a leak here though. According to the doc: https://developer.gnome.org/atk/unstable/AtkObject.html#atk-object-get-attributes "This atkattributeset should be freed by a call to atk_attribute_set_free()." 905424 8 brian.holt 2013-07-02 07:41:38 -0700 (In reply to comment #7) > (From update of attachment 205904 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=205904&action=review > > > Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:315 > > + GOwnPtr<char> attributeString(attributeSetToString(atk_object_get_attributes(ATK_OBJECT(m_element)))); > > There is indeed a leak here though. According to the doc: > https://developer.gnome.org/atk/unstable/AtkObject.html#atk-object-get-attributes > > "This atkattributeset should be freed by a call to atk_attribute_set_free()." Yes, I've just been discussing with Mario how to resolve this. The best fix requires a specialisation of GOwnPtr so I'll propose that in a separate bug (coming shortly). 905425 9 205904 cdumez 2013-07-02 07:43:05 -0700 Comment on attachment 205904 Revised patch View in context: https://bugs.webkit.org/attachment.cgi?id=205904&action=review >> Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:315 >> + GOwnPtr<char> attributeString(attributeSetToString(atk_object_get_attributes(ATK_OBJECT(m_element)))); > > There is indeed a leak here though. According to the doc: > https://developer.gnome.org/atk/unstable/AtkObject.html#atk-object-get-attributes > > "This atkattributeset should be freed by a call to atk_attribute_set_free()." And BTW, same issue in Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp. Maybe you can fix the leaks in WKTR as well in the same patch? 905426 10 brian.holt 2013-07-02 07:45:26 -0700 (In reply to comment #9) > (From update of attachment 205904 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=205904&action=review > > >> Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:315 > >> + GOwnPtr<char> attributeString(attributeSetToString(atk_object_get_attributes(ATK_OBJECT(m_element)))); > > > > There is indeed a leak here though. According to the doc: > > https://developer.gnome.org/atk/unstable/AtkObject.html#atk-object-get-attributes > > > > "This atkattributeset should be freed by a call to atk_attribute_set_free()." > > And BTW, same issue in Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp. Maybe you can fix the leaks in WKTR as well in the same patch? Absolutely :-) 905427 11 cdumez 2013-07-02 07:46:41 -0700 (In reply to comment #8) > (In reply to comment #7) > > (From update of attachment 205904 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=205904&action=review > > > > > Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:315 > > > + GOwnPtr<char> attributeString(attributeSetToString(atk_object_get_attributes(ATK_OBJECT(m_element)))); > > > > There is indeed a leak here though. According to the doc: > > https://developer.gnome.org/atk/unstable/AtkObject.html#atk-object-get-attributes > > > > "This atkattributeset should be freed by a call to atk_attribute_set_free()." > > Yes, I've just been discussing with Mario how to resolve this. The best fix requires a specialisation of GOwnPtr so I'll propose that in a separate bug (coming shortly). I agree, probably in a new Source/WebCore/accessibility/atk/GOwnPtrAtk.h ? See for example: Source/WebCore/platform/network/soup/GOwnPtrSoup.* 905432 12 205916 brian.holt 2013-07-02 07:53:11 -0700 Created attachment 205916 Patch Fix for 1 of the 3 leaks 905436 13 205916 cdumez 2013-07-02 08:01:47 -0700 Comment on attachment 205916 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=205916&action=review > Tools/ChangeLog:8 > + Reviewed by Christophe Dumez. The patch did not get r+. So It is a bit early to update this line :) > Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:425 > + GOwnPtr<gchar> axValue(g_strdup_printf("AXValue: %s", textWithReplacedCharacters.get())); Would you fix the same issue in Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp in the same patch please? 905437 14 brian.holt 2013-07-02 08:19:03 -0700 (In reply to comment #13) > (From update of attachment 205916 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=205916&action=review > > > Tools/ChangeLog:8 > > + Reviewed by Christophe Dumez. > > The patch did not get r+. So It is a bit early to update this line :) Sorry, I didn't realise that we only do that after r+. Because I'm not a committer I thought I could make the change to avoid having to upload another patch after r+ ... > > > Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:425 > > + GOwnPtr<gchar> axValue(g_strdup_printf("AXValue: %s", textWithReplacedCharacters.get())); > > Would you fix the same issue in Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp in the same patch please? It turns out that this has already been fixed in WKTR, but it wasn't applied to the DRT. 905441 15 205916 cdumez 2013-07-02 08:26:23 -0700 Comment on attachment 205916 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=205916&action=review >>> Tools/ChangeLog:8 >>> + Reviewed by Christophe Dumez. >> >> The patch did not get r+. So It is a bit early to update this line :) > > Sorry, I didn't realise that we only do that after r+. Because I'm not a committer I thought I could make the change to avoid having to upload another patch after r+ ... You don't have to reupload a patch after r+ unless there are nits to fix. This line gets automatically updated when landing after a r+. >>> Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:425 >>> + GOwnPtr<gchar> axValue(g_strdup_printf("AXValue: %s", textWithReplacedCharacters.get())); >> >> Would you fix the same issue in Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp in the same patch please? > > It turns out that this has already been fixed in WKTR, but it wasn't applied to the DRT. Oh, my bad. I misread my grep output. 905475 16 205916 commit-queue 2013-07-02 09:51:32 -0700 Comment on attachment 205916 Patch Clearing flags on attachment: 205916 Committed r152298: <http://trac.webkit.org/changeset/152298> 905476 17 commit-queue 2013-07-02 09:51:35 -0700 All reviewed patches have been landed. Closing bug. 205903 2013-07-02 06:31:18 -0700 2013-07-02 06:38:25 -0700 Patch bug-118297-20130702142922.patch text/plain 2301 brian.holt U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMjgxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDk2MjEyNjNjODQzZjA5OWI3ZTFlNzdmNDI5NzdkYWQ2 YWVkMTQ5YS4uNzk1MDkwYTJiNjMzODg0ZWEwMGEyZmMwNmRkYjk4NzY5NDIzMWQ5NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEzLTA3LTAyICBCcmlhbiBIb2x0ICA8YnJpYW4uaG9sdEBzYW1zdW5nLmNvbT4KKwor ICAgICAgICBbQVRLXSBMZWFrOiBsZWFrcyBpbiBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTgyOTcKKworICAg ICAgICBGaXhlZCBtZW1vcnkgbGVha3MuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9hdGsvQWNjZXNzaWJpbGl0eVVJRWxl bWVudEF0ay5jcHA6CisgICAgICAgIChBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjphbGxBdHRyaWJ1 dGVzKToKKyAgICAgICAgKEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnN0cmluZ1ZhbHVlKToKKwog MjAxMy0wNy0wMSAgTmljayBEaWVnbyBZYW1hbmUgIDxuaWNrLnlhbWFuZUBvcGVuYm9zc2Eub3Jn PgogCiAgICAgICAgIFtFZmxdW0d0a10gTG9vayBhdCBXRUJLSVRfT1VUUFVURElSIGluc3RlYWQg b2YgV0VCS0lUT1VUUFVURElSIGluIGpoYnVpbGRyYwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJl bmRlclRyZWUvYXRrL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRBdGsuY3BwIGIvVG9vbHMvRHVtcFJl bmRlclRyZWUvYXRrL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRBdGsuY3BwCmluZGV4IGEyMzM1MmVh YWY1M2IzMzQ1MWRjM2ViODI1YjA2ZmRhZjM4Y2Q2MTQuLjYxNTlhMGEzYTRkOTEyODBhN2M2ZmZj MzJlMGU0NWU3NjM1ZmY0MzEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2F0ay9B Y2Nlc3NpYmlsaXR5VUlFbGVtZW50QXRrLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9h dGsvQWNjZXNzaWJpbGl0eVVJRWxlbWVudEF0ay5jcHAKQEAgLTMxMiw3ICszMTIsOCBAQCBKU1N0 cmluZ1JlZiBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjphbGxBdHRyaWJ1dGVzKCkKICAgICAgICAg cmV0dXJuIEpTU3RyaW5nQ3JlYXRlV2l0aENoYXJhY3RlcnMoMCwgMCk7CiAKICAgICBBU1NFUlQo QVRLX0lTX09CSkVDVChtX2VsZW1lbnQpKTsKLSAgICBHT3duUHRyPGdjaGFyPiBhdHRyaWJ1dGVE YXRhKGF0dHJpYnV0ZVNldFRvU3RyaW5nKGF0a19vYmplY3RfZ2V0X2F0dHJpYnV0ZXMoQVRLX09C SkVDVChtX2VsZW1lbnQpKSkpOworICAgIEdPd25QdHI8Y2hhcj4gYXR0cmlidXRlU3RyaW5nKGF0 dHJpYnV0ZVNldFRvU3RyaW5nKGF0a19vYmplY3RfZ2V0X2F0dHJpYnV0ZXMoQVRLX09CSkVDVCht X2VsZW1lbnQpKSkpOworICAgIEdPd25QdHI8Y2hhcj4gYXR0cmlidXRlRGF0YShhdHRyaWJ1dGVT dHJpbmcuZ2V0KCkpOwogICAgIHJldHVybiBKU1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZyhh dHRyaWJ1dGVEYXRhLmdldCgpKTsKIH0KIApAQCAtNDIwLDkgKzQyMSw5IEBAIEpTU3RyaW5nUmVm IEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnN0cmluZ1ZhbHVlKCkKICAgICBpZiAoIW1fZWxlbWVu dCB8fCAhQVRLX0lTX1RFWFQobV9lbGVtZW50KSkKICAgICAgICAgcmV0dXJuIEpTU3RyaW5nQ3Jl YXRlV2l0aENoYXJhY3RlcnMoMCwgMCk7CiAKLSAgICBnY2hhciogdGV4dCA9IGF0a190ZXh0X2dl dF90ZXh0KEFUS19URVhUKG1fZWxlbWVudCksIDAsIC0xKTsKLSAgICBHT3duUHRyPGdjaGFyPiBh eFZhbHVlKGdfc3RyZHVwX3ByaW50ZigiQVhWYWx1ZTogJXMiLCByZXBsYWNlQ2hhcmFjdGVyc0Zv clJlc3VsdHModGV4dCkpKTsKLSAgICBnX2ZyZWUodGV4dCk7CisgICAgR093blB0cjxnY2hhcj4g dGV4dChhdGtfdGV4dF9nZXRfdGV4dChBVEtfVEVYVChtX2VsZW1lbnQuZ2V0KCkpLCAwLCAtMSkp OworICAgIEdPd25QdHI8Z2NoYXI+IHRleHRXaXRoUmVwbGFjZWRDaGFyYWN0ZXJzKHJlcGxhY2VD aGFyYWN0ZXJzRm9yUmVzdWx0cyh0ZXh0LmdldCgpKSk7CisgICAgR093blB0cjxnY2hhcj4gYXhW YWx1ZShnX3N0cmR1cF9wcmludGYoIkFYVmFsdWU6ICVzIiwgdGV4dFdpdGhSZXBsYWNlZENoYXJh Y3RlcnMuZ2V0KCkpKTsKIAogICAgIHJldHVybiBKU1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmlu ZyhheFZhbHVlLmdldCgpKTsKIH0K 205904 2013-07-02 06:38:31 -0700 2013-07-02 07:53:04 -0700 Revised patch bug-118297-20130702143635.patch text/plain 2295 brian.holt U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMjgxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDk2MjEyNjNjODQzZjA5OWI3ZTFlNzdmNDI5NzdkYWQ2 YWVkMTQ5YS4uNzk1MDkwYTJiNjMzODg0ZWEwMGEyZmMwNmRkYjk4NzY5NDIzMWQ5NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEzLTA3LTAyICBCcmlhbiBIb2x0ICA8YnJpYW4uaG9sdEBzYW1zdW5nLmNvbT4KKwor ICAgICAgICBbQVRLXSBMZWFrOiBsZWFrcyBpbiBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTgyOTcKKworICAg ICAgICBGaXhlZCBtZW1vcnkgbGVha3MuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9hdGsvQWNjZXNzaWJpbGl0eVVJRWxl bWVudEF0ay5jcHA6CisgICAgICAgIChBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjphbGxBdHRyaWJ1 dGVzKToKKyAgICAgICAgKEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnN0cmluZ1ZhbHVlKToKKwog MjAxMy0wNy0wMSAgTmljayBEaWVnbyBZYW1hbmUgIDxuaWNrLnlhbWFuZUBvcGVuYm9zc2Eub3Jn PgogCiAgICAgICAgIFtFZmxdW0d0a10gTG9vayBhdCBXRUJLSVRfT1VUUFVURElSIGluc3RlYWQg b2YgV0VCS0lUT1VUUFVURElSIGluIGpoYnVpbGRyYwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJl bmRlclRyZWUvYXRrL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRBdGsuY3BwIGIvVG9vbHMvRHVtcFJl bmRlclRyZWUvYXRrL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRBdGsuY3BwCmluZGV4IGEyMzM1MmVh YWY1M2IzMzQ1MWRjM2ViODI1YjA2ZmRhZjM4Y2Q2MTQuLmE3MWNlMzQwYTg0Y2UzNDljNGM4MjM2 YWI2MTRmZTc3ZGZjNWJiY2UgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2F0ay9B Y2Nlc3NpYmlsaXR5VUlFbGVtZW50QXRrLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9h dGsvQWNjZXNzaWJpbGl0eVVJRWxlbWVudEF0ay5jcHAKQEAgLTMxMiw3ICszMTIsOCBAQCBKU1N0 cmluZ1JlZiBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjphbGxBdHRyaWJ1dGVzKCkKICAgICAgICAg cmV0dXJuIEpTU3RyaW5nQ3JlYXRlV2l0aENoYXJhY3RlcnMoMCwgMCk7CiAKICAgICBBU1NFUlQo QVRLX0lTX09CSkVDVChtX2VsZW1lbnQpKTsKLSAgICBHT3duUHRyPGdjaGFyPiBhdHRyaWJ1dGVE YXRhKGF0dHJpYnV0ZVNldFRvU3RyaW5nKGF0a19vYmplY3RfZ2V0X2F0dHJpYnV0ZXMoQVRLX09C SkVDVChtX2VsZW1lbnQpKSkpOworICAgIEdPd25QdHI8Y2hhcj4gYXR0cmlidXRlU3RyaW5nKGF0 dHJpYnV0ZVNldFRvU3RyaW5nKGF0a19vYmplY3RfZ2V0X2F0dHJpYnV0ZXMoQVRLX09CSkVDVCht X2VsZW1lbnQpKSkpOworICAgIEdPd25QdHI8Y2hhcj4gYXR0cmlidXRlRGF0YShhdHRyaWJ1dGVT dHJpbmcuZ2V0KCkpOwogICAgIHJldHVybiBKU1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZyhh dHRyaWJ1dGVEYXRhLmdldCgpKTsKIH0KIApAQCAtNDIwLDkgKzQyMSw5IEBAIEpTU3RyaW5nUmVm IEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnN0cmluZ1ZhbHVlKCkKICAgICBpZiAoIW1fZWxlbWVu dCB8fCAhQVRLX0lTX1RFWFQobV9lbGVtZW50KSkKICAgICAgICAgcmV0dXJuIEpTU3RyaW5nQ3Jl YXRlV2l0aENoYXJhY3RlcnMoMCwgMCk7CiAKLSAgICBnY2hhciogdGV4dCA9IGF0a190ZXh0X2dl dF90ZXh0KEFUS19URVhUKG1fZWxlbWVudCksIDAsIC0xKTsKLSAgICBHT3duUHRyPGdjaGFyPiBh eFZhbHVlKGdfc3RyZHVwX3ByaW50ZigiQVhWYWx1ZTogJXMiLCByZXBsYWNlQ2hhcmFjdGVyc0Zv clJlc3VsdHModGV4dCkpKTsKLSAgICBnX2ZyZWUodGV4dCk7CisgICAgR093blB0cjxnY2hhcj4g dGV4dChhdGtfdGV4dF9nZXRfdGV4dChBVEtfVEVYVChtX2VsZW1lbnQpLCAwLCAtMSkpOworICAg IEdPd25QdHI8Z2NoYXI+IHRleHRXaXRoUmVwbGFjZWRDaGFyYWN0ZXJzKHJlcGxhY2VDaGFyYWN0 ZXJzRm9yUmVzdWx0cyh0ZXh0LmdldCgpKSk7CisgICAgR093blB0cjxnY2hhcj4gYXhWYWx1ZShn X3N0cmR1cF9wcmludGYoIkFYVmFsdWU6ICVzIiwgdGV4dFdpdGhSZXBsYWNlZENoYXJhY3RlcnMu Z2V0KCkpKTsKIAogICAgIHJldHVybiBKU1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZyhheFZh bHVlLmdldCgpKTsKIH0K 205916 2013-07-02 07:53:11 -0700 2013-07-02 09:51:31 -0700 Patch bug-118297-20130702155115.patch text/plain 1740 brian.holt U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMjgxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDk2MjEyNjNjODQzZjA5OWI3ZTFlNzdmNDI5NzdkYWQ2 YWVkMTQ5YS4uOGMyMTM0YjZhOWQ0ZDMxMjY1YWUwOWMzYTM5MmM5YzI1Y2Q1OWZmZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDEzLTA3LTAyICBCcmlhbiBIb2x0ICA8YnJpYW4uaG9sdEBzYW1zdW5nLmNvbT4KKwor ICAgICAgICBbQVRLXSBMZWFrOiBsZWFrcyBpbiBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTgyOTcKKworICAg ICAgICBGaXhlZCBtZW1vcnkgbGVhay4KKworICAgICAgICBSZXZpZXdlZCBieSBDaHJpc3RvcGhl IER1bWV6LgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvYXRrL0FjY2Vzc2liaWxpdHlVSUVs ZW1lbnRBdGsuY3BwOgorICAgICAgICAoQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6c3RyaW5nVmFs dWUpOgorCiAyMDEzLTA3LTAxICBOaWNrIERpZWdvIFlhbWFuZSAgPG5pY2sueWFtYW5lQG9wZW5i b3NzYS5vcmc+CiAKICAgICAgICAgW0VmbF1bR3RrXSBMb29rIGF0IFdFQktJVF9PVVRQVVRESVIg aW5zdGVhZCBvZiBXRUJLSVRPVVRQVVRESVIgaW4gamhidWlsZHJjCmRpZmYgLS1naXQgYS9Ub29s cy9EdW1wUmVuZGVyVHJlZS9hdGsvQWNjZXNzaWJpbGl0eVVJRWxlbWVudEF0ay5jcHAgYi9Ub29s cy9EdW1wUmVuZGVyVHJlZS9hdGsvQWNjZXNzaWJpbGl0eVVJRWxlbWVudEF0ay5jcHAKaW5kZXgg YTIzMzUyZWFhZjUzYjMzNDUxZGMzZWI4MjViMDZmZGFmMzhjZDYxNC4uMDAzY2FkYmE4ZGNmMWMy Y2ZjMjQwYmJmOTZjY2ZiMzg4MmViYjIwYyAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRy ZWUvYXRrL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRBdGsuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL2F0ay9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50QXRrLmNwcApAQCAtNDIwLDkgKzQyMCw5 IEBAIEpTU3RyaW5nUmVmIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnN0cmluZ1ZhbHVlKCkKICAg ICBpZiAoIW1fZWxlbWVudCB8fCAhQVRLX0lTX1RFWFQobV9lbGVtZW50KSkKICAgICAgICAgcmV0 dXJuIEpTU3RyaW5nQ3JlYXRlV2l0aENoYXJhY3RlcnMoMCwgMCk7CiAKLSAgICBnY2hhciogdGV4 dCA9IGF0a190ZXh0X2dldF90ZXh0KEFUS19URVhUKG1fZWxlbWVudCksIDAsIC0xKTsKLSAgICBH T3duUHRyPGdjaGFyPiBheFZhbHVlKGdfc3RyZHVwX3ByaW50ZigiQVhWYWx1ZTogJXMiLCByZXBs YWNlQ2hhcmFjdGVyc0ZvclJlc3VsdHModGV4dCkpKTsKLSAgICBnX2ZyZWUodGV4dCk7CisgICAg R093blB0cjxnY2hhcj4gdGV4dChhdGtfdGV4dF9nZXRfdGV4dChBVEtfVEVYVChtX2VsZW1lbnQp LCAwLCAtMSkpOworICAgIEdPd25QdHI8Z2NoYXI+IHRleHRXaXRoUmVwbGFjZWRDaGFyYWN0ZXJz KHJlcGxhY2VDaGFyYWN0ZXJzRm9yUmVzdWx0cyh0ZXh0LmdldCgpKSk7CisgICAgR093blB0cjxn Y2hhcj4gYXhWYWx1ZShnX3N0cmR1cF9wcmludGYoIkFYVmFsdWU6ICVzIiwgdGV4dFdpdGhSZXBs YWNlZENoYXJhY3RlcnMuZ2V0KCkpKTsKIAogICAgIHJldHVybiBKU1N0cmluZ0NyZWF0ZVdpdGhV VEY4Q1N0cmluZyhheFZhbHVlLmdldCgpKTsKIH0K