From fed89ef8881e0cebb9d60de36c19ee4e181e86fa Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Thu, 30 Aug 2018 10:52:38 -0400
Subject: [PATCH] Better protection against bad data in c77.  Slightly wider
 default Settings window.

---
 Configuration.ui       |  6 +++---
 lib/77bit/packjt77.f90 | 12 ++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Configuration.ui b/Configuration.ui
index 9b1685930..129a7d37d 100644
--- a/Configuration.ui
+++ b/Configuration.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>532</width>
+    <width>534</width>
     <height>546</height>
    </rect>
   </property>
@@ -3076,10 +3076,10 @@ soundcard changes</string>
  <buttongroups>
   <buttongroup name="CAT_stop_bits_button_group"/>
   <buttongroup name="split_mode_button_group"/>
-  <buttongroup name="CAT_handshake_button_group"/>
-  <buttongroup name="TX_mode_button_group"/>
   <buttongroup name="CAT_data_bits_button_group"/>
+  <buttongroup name="CAT_handshake_button_group"/>
   <buttongroup name="TX_audio_source_button_group"/>
+  <buttongroup name="TX_mode_button_group"/>
   <buttongroup name="PTT_method_button_group"/>
  </buttongroups>
 </ui>
diff --git a/lib/77bit/packjt77.f90 b/lib/77bit/packjt77.f90
index 6af3b3bf9..706cccb99 100644
--- a/lib/77bit/packjt77.f90
+++ b/lib/77bit/packjt77.f90
@@ -232,10 +232,14 @@ subroutine unpack77(c77,msg)
        "NB ","NS ","QC ","ON ","MB ","SK ","AB ","BC ","NWT","NF ",  &
        "LB ","NU ","VT ","PEI","DC "/
 
-  if(index(c77,'*').ge.1) then        !Check for bad data
-     msg='QUIRK 2'
-     return
-  endif
+  
+! Check for bad data
+  do i=1,77
+     if(c77(i:i).ne.'0' .and. c77(i:i).ne.'1') then
+        msg='QUIRK 2'
+        return
+     endif
+  enddo
 
   read(c77(72:77),'(2b3)') n3,i3
   msg=repeat(' ',37)