Changeset 52 for trunk/gui/util

Timestamp:

Aug 17, 2016, 9:31:36 AM (9 years ago)

Author:

Alex Taylor

Message:

Add sanity checks to prevent some exception conditions.

Location:

trunk/gui/util/prntobj

Files:

• builddbg.cmd (added)
• prntobj.c (modified) (4 diffs)

trunk/gui/util/prntobj/prntobj.c

@@ -10 +10 @@
 #define INCL_SPLDOSPRINT
 #define INCL_SPLERRORS
+#define INCL_WINSHELLDATA
 #include <os2.h>
 #include <stdio.h>
@@ -17 +18 @@
 
 #define MAX_DEVICE_NAME     9
+
+/* Various defines copied from CUPS.PDR...
+ */
+#define STR_LEN_PORTNAME          12
+#define STR_LEN_INIVAL            256
+#define STR_LEN_HOSTNAME          64
+#define STR_LEN_QUEUENAME         64
+
+#define APPNAME_LEAD_STR          "PM_"
+#define APPNAME_PM_PORT_DRIVER    "PM_PORT_DRIVER"
+#define APPNAME_PM_SPOOLER_PORT   "PM_SPOOLER_PORT"
+
+#define KEY_DESCRIPTION           "DESCRIPTION"
+#define KEY_INITIALIZATION        "INITIALIZATION"
+#define KEY_TERMINATION           "TERMINATION"
+#define KEY_PORTDRIVER            "PORTDRIVER"
+#define KEY_TIMEOUT               "TIMEOUT"
 
 
@@ -87 +105 @@
               pszTitle      = NULL;
     CHAR      szDeviceName[ 9 ] = {0};
-    USHORT    i, len;
+    CHAR      szIniApp[ STR_LEN_PORTNAME ] = {0};
+    CHAR      szIniVal[ STR_LEN_INIVAL ] = {0};
+    USHORT    i;
     SPLERR    rc;
 
@@ -104 +124 @@
     pszModel     = argv[ 3 ];
     pszTitle     = argv[ 4 ];
+    if ( strlen( pszTitle ) > 47 )
+        pszTitle[ 47 ] = '\0';
+
+    // Make sure the specified port exists and has valid settings.
+    strcpy( szIniApp, APPNAME_LEAD_STR );
+    strncat( szIniApp, pszPortName, STR_LEN_PORTNAME-1 );
+    rc = PrfQueryProfileString( HINI_SYSTEMPROFILE, szIniApp,
+                                KEY_PORTDRIVER, NULL,
+                                (PVOID) szIniVal, STR_LEN_INIVAL );
+    if ( rc < 2 ) {
+        printf("Error: %s does not appear to be a valid port.\n", pszPortName );
+        return ( 1 );
+    }
 
     // Generate a suitable internal device name