cvs: php4 /ext/printer printer.c
| From: | Frank M. Kromann | Date: | Fri, 27 Oct 2000 20:07:15 +0000 |
| Subject: | cvs: php4 /ext/printer printer.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-2313@lists.php.net to get a copy of this message | ||
fmk Fri Oct 27 13:07:15 2000 EDT
Modified files:
/php4/ext/printer printer.c
Log:
Adding checks on pointers before returning values.
Index: php4/ext/printer/printer.c
diff -u php4/ext/printer/printer.c:1.1 php4/ext/printer/printer.c:1.2
--- php4/ext/printer/printer.c:1.1 Fri Oct 27 12:27:20 2000
+++ php4/ext/printer/printer.c Fri Oct 27 13:07:14 2000
@@ -103,7 +103,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "Printer Support" , "enabled");
php_info_print_table_row(2, "Default printing device", get_default_printer());
- php_info_print_table_row(2, "RCS Version" , "$Id: printer.c,v 1.1
2000/10/27 19:27:20 dbeu Exp $");
+ php_info_print_table_row(2, "RCS Version" , "$Id: printer.c,v 1.2
2000/10/27 20:07:14 fmk Exp $");
php_info_print_table_end();
}
@@ -313,19 +313,23 @@
P1++;
break;
case 2:
- add_assoc_string(Printer, "SERVERNAME", P2->pServerName, 1);
- add_assoc_string(Printer, "PRINTERNAME", P2->pPrinterName, 1);
- add_assoc_string(Printer, "SHARENAME", P2->pShareName, 1);
- add_assoc_string(Printer, "PORTNAME", P2->pPortName, 1);
- add_assoc_string(Printer, "DRIVERNAME", P2->pDriverName, 1);
- add_assoc_string(Printer, "COMMENT", P2->pComment, 1);
- add_assoc_string(Printer, "LOCATION", P2->pLocation, 1);
-// add_assoc_string(Printer, "DEVMODE", P2->pDevMode, 1);
- add_assoc_string(Printer, "SEPFILE", P2->pSepFile, 1);
- add_assoc_string(Printer, "PRINTPROCESSOR", P2->pPrintProcessor, 1);
- add_assoc_string(Printer, "DATATYPE", P2->pDatatype, 1);
- add_assoc_string(Printer, "PARAMETRES", P2->pParameters, 1);
-// add_assoc_string(Printer, "SECURITYDESCRIPTOR", P2->pSecurityDescriptor, 1);
+ if (P2->pServerName) add_assoc_string(Printer, "SERVERNAME", P2->pServerName,
1);
+ if (P2->pPrinterName) add_assoc_string(Printer, "PRINTERNAME",
P2->pPrinterName, 1);
+ if (P2->pShareName) add_assoc_string(Printer, "SHARENAME", P2->pShareName, 1);
+ if (P2->pPortName) add_assoc_string(Printer, "PORTNAME", P2->pPortName, 1);
+ if (P2->pDriverName) add_assoc_string(Printer, "DRIVERNAME", P2->pDriverName,
1);
+ if (P2->pComment) add_assoc_string(Printer, "COMMENT", P2->pComment, 1);
+ if (P2->pLocation) add_assoc_string(Printer, "LOCATION", P2->pLocation, 1);
+/*
+ add_assoc_string(Printer, "DEVMODE", P2->pDevMode, 1);
+*/
+ if (P2->pSepFile) add_assoc_string(Printer, "SEPFILE", P2->pSepFile, 1);
+ if (P2->pPrintProcessor) add_assoc_string(Printer, "PRINTPROCESSOR",
P2->pPrintProcessor, 1);
+ if (P2->pDatatype) add_assoc_string(Printer, "DATATYPE", P2->pDatatype, 1);
+ if (P2->pParameters) add_assoc_string(Printer, "PARAMETRES", P2->pParameters,
1);
+/*
+ add_assoc_string(Printer, "SECURITYDESCRIPTOR", P2->pSecurityDescriptor, 1);
+*/
add_assoc_long(Printer, "ATTRIBUTES", P2->Attributes);
add_assoc_long(Printer, "PRIORITY", P2->Priority);
add_assoc_long(Printer, "DEFAULTPRIORITY", P2->DefaultPriority);