Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@4484 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index 87e4c51ae6a2e1ef99ccc6847470ef8ab93ca52e..c641e794a380d074080eb3578d5618526e2a7d30 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,10 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.23
 
+       - Updated the Spanish man pages (STR #1041)
+       - The lpstat man page contained a typo (STR #1040)
+       - The scheduler's is_path_absolute() code could cause a
+         DoS (STR #1042)
        - The scheduler's device loading code used the wrong
          size limits for the make/model and info parameters
          (STR #1035)

diff --git a/scheduler/client.c b/scheduler/client.c
index 6fafaccc1ff7fda909693f28facd1424c30e1e0c..9b54d94906cd3b13663e7050e8b12a480a635d9a 100644 (file)
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.c,v 1.91.2.96 2004/10/04 19:48:56 mike Exp $"
+ * "$Id: client.c,v 1.91.2.97 2005/01/03 18:48:04 mike Exp $"
  *
  *   Client routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -2853,9 +2853,13 @@ is_path_absolute(const char *path)       /* I - Input path */
   */
 
   while ((path = strstr(path, "/..")) != NULL)
+  {
     if (!path[3] || path[3] == '/')
       return (0);
 
+    path ++;
+  }
+
  /*
   * If we haven't found any relative paths, return 1 indicating an
   * absolute path...
@@ -3424,5 +3428,5 @@ CDSAWriteFunc(SSLConnectionRef connection,        /* I  - SSL/TLS connection */
 
 
 /*
- * End of "$Id: client.c,v 1.91.2.96 2004/10/04 19:48:56 mike Exp $".
+ * End of "$Id: client.c,v 1.91.2.97 2005/01/03 18:48:04 mike Exp $".
  */