From e956a01e95dfc6bd52e54ae92f3368889c28b6c5 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Tue, 2 Apr 2013 16:37:10 +0000
Subject: [PATCH] Fix pack/unpack bugs reported by VE5VA.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3121 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 lib/packtext.f    | 8 ++++----
 lib/unpackmsg.f90 | 2 +-
 mainwindow.cpp    | 2 +-
 wsjtx.iss         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/packtext.f b/lib/packtext.f
index c06581a0a..c4029766f 100644
--- a/lib/packtext.f
+++ b/lib/packtext.f
@@ -2,7 +2,7 @@
 
       parameter (MASK28=2**28 - 1)
       character*13 msg
-      character*44 c
+      character*42 c
       data c/'0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ +-./?'/
 
       nc1=0
@@ -10,7 +10,7 @@
       nc3=0
 
       do i=1,5                                !First 5 characters in nc1
-         do j=1,44                            !Get character code
+         do j=1,42                            !Get character code
             if(msg(i:i).eq.c(j:j)) go to 10
          enddo
          j=37
@@ -19,7 +19,7 @@
       enddo
 
       do i=6,10                               !Characters 6-10 in nc2
-         do j=1,44                            !Get character code
+         do j=1,42                            !Get character code
             if(msg(i:i).eq.c(j:j)) go to 20
          enddo
          j=37
@@ -28,7 +28,7 @@
       enddo
 
       do i=11,13                              !Characters 11-13 in nc3
-         do j=1,44                            !Get character code
+         do j=1,42                            !Get character code
             if(msg(i:i).eq.c(j:j)) go to 30
          enddo
          j=37
diff --git a/lib/unpackmsg.f90 b/lib/unpackmsg.f90
index 3cc2d8df3..c71256740 100644
--- a/lib/unpackmsg.f90
+++ b/lib/unpackmsg.f90
@@ -16,7 +16,7 @@ subroutine unpackmsg(dat,msg)
 
   ng=ishft(iand(dat(10),15),12) + ishft(dat(11),6) + dat(12)
 
-  if(ng.gt.32768) then
+  if(ng.ge.32768) then
      call unpacktext(nc1,nc2,ng,msg)
      go to 100
   endif
diff --git a/mainwindow.cpp b/mainwindow.cpp
index a91041c5f..bc1456c86 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,4 +1,4 @@
-//-------------------------------------------------------------- MainWindow
+//------------------------------------------------------------- MainWindow
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "devsetup.h"
diff --git a/wsjtx.iss b/wsjtx.iss
index b1f20c42a..b7e7e4b1d 100644
--- a/wsjtx.iss
+++ b/wsjtx.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName=wsjtx
-AppVerName=wsjtx Version 0.8 r3113
+AppVerName=wsjtx Version 0.8 r3118
 AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT
 DefaultDirName=c:\wsjtx
 DefaultGroupName=wsjtx