You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2018/07/13 04:00:09 UTC
svn commit: r1835782 - in /subversion/branches/1.10.x: ./ STATUS
subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
Author: svn-role
Date: Fri Jul 13 04:00:09 2018
New Revision: 1835782
URL: http://svn.apache.org/viewvc?rev=1835782&view=rev
Log:
Merge r1835760 from trunk:
* r1835760
Fix segfault in the gnome keyring password provider (libsecret version).
Justification:
Private API violation; fixes user-reported segfault due to uninitialized
stack variable.
Votes:
+1: danielsh, philip, jamessan
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 13 04:00:09 2018
@@ -101,4 +101,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015,1829241,1829260,1829344,1830882-1830883,1830885,1830900-1830901,1831110,1831112,1831540,1833621,1833836,1833842
+/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015,1829241,1829260,1829344,1830882-1830883,1830885,1830900-1830901,1831110,1831112,1831540,1833621,1833836,1833842,1835760
Modified: subversion/branches/1.10.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1835782&r1=1835781&r2=1835782&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Fri Jul 13 04:00:09 2018
@@ -62,11 +62,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1835760
- Fix segfault in the gnome keyring password provider (libsecret version).
- Justification:
- Private API violation; fixes user-reported segfault due to uninitialized
- stack variable.
- Votes:
- +1: danielsh, philip, jamessan
Modified: subversion/branches/1.10.x/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c?rev=1835782&r1=1835781&r2=1835782&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c Fri Jul 13 04:00:09 2018
@@ -118,6 +118,8 @@ password_get_gnome_keyring(svn_boolean_t
{
GError *gerror = NULL;
gchar *gpassword;
+
+ *done = FALSE;
if (!available_collection(non_interactive, pool))
return SVN_NO_ERROR;
@@ -129,6 +131,7 @@ password_get_gnome_keyring(svn_boolean_t
NULL);
if (gerror)
{
+ /* ### TODO: return or log the error? */
g_error_free(gerror);
}
else if (gpassword)
@@ -156,6 +159,8 @@ password_set_gnome_keyring(svn_boolean_t
GError *gerror = NULL;
gboolean gstatus;
+ *done = FALSE;
+
if (!available_collection(non_interactive, pool))
return SVN_NO_ERROR;
@@ -170,6 +175,7 @@ password_set_gnome_keyring(svn_boolean_t
NULL);
if (gerror)
{
+ /* ### TODO: return or log the error? */
g_error_free(gerror);
}
else if (gstatus)