Changeset 480 for trunk/server/source3/printing/nt_printing.c

Timestamp:

Aug 2, 2010, 8:16:45 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: trunk update to 3.5.4

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/printing/nt_printing.c (modified) (4 diffs)

trunk/server/source3/printing/nt_printing.c

@@ -92 +92 @@
         {"Statement",0x1,0x221b4,0x34b5c,0x0,0x0,0x221b4,0x34b5c},
         {"Executive",0x1,0x2cf56,0x411cc,0x0,0x0,0x2cf56,0x411cc},
+        {"A0",0x1,0xcd528,0x122488,0x0,0x0,0xcd528,0x122488},
+        {"A1",0x1,0x91050,0xcd528,0x0,0x0,0x91050,0xcd528},
         {"A3",0x1,0x48828,0x668a0,0x0,0x0,0x48828,0x668a0},
         {"A4",0x1,0x33450,0x48828,0x0,0x0,0x33450,0x48828},
@@ -1603 +1605 @@
 
 #define strip_driver_path(_mem_ctx, _element) do { \
-        if ((_p = strrchr((_element), '\\')) != NULL) { \
+        if (_element && ((_p = strrchr((_element), '\\')) != NULL)) { \
                 (_element) = talloc_asprintf((_mem_ctx), "%s", _p+1); \
                 W_ERROR_HAVE_NO_MEMORY((_element)); \
@@ -1624 +1626 @@
         char *_p;
 
+        if (!*driver_path || !*data_file || !*config_file) {
+                return WERR_INVALID_PARAM;
+        }
+
         /* clean up the driver name.
          * we can get .\driver.dll
@@ -1633 +1639 @@
         strip_driver_path(mem_ctx, *data_file);
         strip_driver_path(mem_ctx, *config_file);
-        strip_driver_path(mem_ctx, *help_file);
+        if (help_file) {
+                strip_driver_path(mem_ctx, *help_file);
+        }
 
         if (dependent_files && dependent_files->string) {