[git] Pinentry - branch, master, updated. pinentry-0.8.2-2-gd33537a

[by Ben Kibbey]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The standard pinentry collection".

The branch, master has been updated
       via  d33537aef0358313cbcf1d010b227d93f3430900 (commit)
      from  1ff0a843c4b418b88ccd6665a469d7ebfdd23cd1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d33537aef0358313cbcf1d010b227d93f3430900
Author: Ben Kibbey <bjk at luxsci.net>
Date:   Sat Jan 5 18:27:11 2013 -0500

    Fix initializing the timeout timer.
    
    When timeout == 0 a segfault would occur.

diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp
index 95096d4..a8dbb42 100644
--- a/qt4/pinentrydialog.cpp
+++ b/qt4/pinentrydialog.cpp
@@ -147,12 +147,14 @@ PinEntryDialog::PinEntryDialog( QWidget* parent, const char* name,
       _ok->setIcon( style()->standardIcon( QStyle::SP_DialogOkButton ) );
       _cancel->setIcon( style()->standardIcon( QStyle::SP_DialogCancelButton ) );
     }
- 
+
   if (timeout > 0) {
       _timer = new QTimer(this);
       connect(_timer, SIGNAL(timeout()), this, SLOT(slotTimeout()));
       _timer->start(timeout*1000);
   }
+  else
+    _timer = NULL;
 
   connect( buttons, SIGNAL(accepted()), this, SLOT(accept()) );
   connect( buttons, SIGNAL(rejected()), this, SLOT(reject()) );
@@ -268,7 +270,9 @@ void PinEntryDialog::updateQuality(const secqstring & txt )
   int percent;
   QPalette pal;
 
-  _timer->stop();
+  if (_timer)
+    _timer->stop();
+
   if (!_have_quality_bar || !_pinentry_info)
     return;
   secstring pinStr = toUtf8(txt);

-----------------------------------------------------------------------

Summary of changes:
 qt4/pinentrydialog.cpp |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The standard pinentry collection
http://git.gnupg.org