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 2012/10/12 06:02:58 UTC
svn commit: r1397428 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_subr/win32_crypto.c
Author: svn-role
Date: Fri Oct 12 04:02:57 2012
New Revision: 1397428
URL: http://svn.apache.org/viewvc?rev=1397428&view=rev
Log:
Merge r1396285 from trunk:
* r1396285
Verify return value instead of pointer.
Justification:
Pointer/boolean code bug. Allows crashing 'svn' with an explicit
--username that doesn't match the stored username.
Votes:
+1: rhuijben, steveking, brane
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_subr/win32_crypto.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1396285
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1397428&r1=1397427&r2=1397428&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Oct 12 04:02:57 2012
@@ -83,11 +83,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1396285
- Verify return value instead of pointer.
- Justification:
- Pointer/boolean code bug. Allows crashing 'svn' with an explicit
- --username that doesn't match the stored username.
- Votes:
- +1: rhuijben, steveking, brane
Modified: subversion/branches/1.7.x/subversion/libsvn_subr/win32_crypto.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_subr/win32_crypto.c?rev=1397428&r1=1397427&r2=1397428&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_subr/win32_crypto.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_subr/win32_crypto.c Fri Oct 12 04:02:57 2012
@@ -104,7 +104,7 @@ windows_password_decrypter(svn_boolean_t
SVN_ERR(svn_auth__simple_password_get(done, &in, creds, realmstring, username,
parameters, non_interactive, pool));
- if (!done)
+ if (!*done)
return SVN_NO_ERROR;
blobin.cbData = strlen(in);
@@ -243,7 +243,7 @@ windows_ssl_client_cert_pw_decrypter(svn
SVN_ERR(svn_auth__ssl_client_cert_pw_get(done, &in, creds, realmstring,
username, parameters,
non_interactive, pool));
- if (!done)
+ if (!*done)
return SVN_NO_ERROR;
blobin.cbData = strlen(in);