[svn] gpgme - r1495 - trunk/src

[svn author marcus]

Author: marcus
Date: 2010-10-28 16:00:14 +0200 (Thu, 28 Oct 2010)
New Revision: 1495

Modified:
   trunk/src/ChangeLog
   trunk/src/opassuan.c
Log:
2010-10-28  Marcus Brinkmann  <marcus.brinkmann at ruhr-uni-bochum.de>

	* opassuan.c (gpgme_op_assuan_transact_ext): Fix uninitialized
	value use.  Reported by Marc Mutz.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-10-07 12:54:17 UTC (rev 1494)
+++ trunk/src/ChangeLog	2010-10-28 14:00:14 UTC (rev 1495)
@@ -1,3 +1,8 @@
+2010-10-28  Marcus Brinkmann  <marcus.brinkmann at ruhr-uni-bochum.de>
+
+	* opassuan.c (gpgme_op_assuan_transact_ext): Fix uninitialized
+	value use.  Reported by Marc Mutz.
+
 2010-10-07  Werner Koch  <wk at g10code.com>
 
 	* gpgme-tool.c (ARGP_ERR_UNKNOWN): Use EDEADLK if available.

Modified: trunk/src/opassuan.c
===================================================================
--- trunk/src/opassuan.c	2010-10-07 12:54:17 UTC (rev 1494)
+++ trunk/src/opassuan.c	2010-10-28 14:00:14 UTC (rev 1495)
@@ -126,9 +126,10 @@
                         data_cb, data_cb_value,
                         inq_cb, inq_cb_value,
                         status_cb, status_cb_value);
-  if (!err)
-    err = _gpgme_wait_one_ext (ctx, &op_err);
+  if (err)
+    goto out;
 
+  err = _gpgme_wait_one_ext (ctx, &op_err);
   if (op_err)
     {
       TRACE_LOG2 ("op_err = %s <%s>", gpgme_strerror (op_err),
@@ -140,7 +141,8 @@
     }
   if (op_err_p)
     *op_err_p = op_err;
-
+  
+ out:
   return TRACE_ERR (err);
 }