From fe10d81843e9ab69569a35b10b3fe98f389bf36f Mon Sep 17 00:00:00 2001
From: Michaelangel007 <michaelangel007@sharedcraft.com>
Date: Mon, 11 Dec 2017 08:24:54 -0800
Subject: [PATCH] Cleanup getHexVal()

---
 prodos.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/prodos.cpp b/prodos.cpp
index 5430fda..8f6f016 100644
--- a/prodos.cpp
+++ b/prodos.cpp
@@ -326,7 +326,7 @@ printf( "ERROR: Create Time not yet implemented\n" );
 
         if( pVal[0] == '$' )
         {
-            val = getHexVal( pVal + 1 );
+            val = getHexVal( pVal ); // safely ignores leading $
             if( val < 0x00 ) val = 0x00;
             if( val > 0xFF ) val = 0xFF;
             entry->type = val;
@@ -352,10 +352,13 @@ printf( "ERROR: Create Time not yet implemented\n" );
         nLenSuffix = nLenPrefix - 4;
         pVal       = arg        + 4;
 
-        val = getHexVal( pVal );
-        if( val < 0x0000 ) val = 0x0000;
-        if( val > 0xFFFF ) val = 0xFFFF;
-        entry->aux = val;
+        if( pVal[0] == '$' )
+        {
+            val = getHexVal( pVal ); // safely ignores leading $
+            if( val < 0x0000 ) val = 0x0000;
+            if( val > 0xFFFF ) val = 0xFFFF;
+            entry->aux = val;
+        }
     }
     else
     if( strncmp( arg, "access=", 7 ) == 0 )