Changeset 4409

Timestamp:

04/06/09 19:16:04 (4 years ago)

Author:

jow

Message:

contrib/lar: fix buffer overflow check, define os dir seperator

Location:

luci/trunk/contrib/lar

Files:

• lar.c (modified) (3 diffs)
• lar.h (modified) (3 diffs)

luci/trunk/contrib/lar/lar.c

@@ -184 +184 @@
     for( len = 0; package[len] != '\0'; len++ )
     {
-        if( len >= sizeof(buffer) )
+        if( len >= (sizeof(buffer) - 5) )
             LAR_DIE("Package name exceeds maximum allowed length");
 
@@ -198 +198 @@
             }
 
-            buffer[i] = ( package[i] == '.' ) ? '/' : package[i];
+            buffer[i] = ( package[i] == '.' ) ? LAR_DIRSEP : package[i];
         }
 
@@ -220 +220 @@
     for( len = 0; package[len] != '\0'; len++ )
     {
-        if( len >= sizeof(buffer) )
+        if( len >= (sizeof(buffer) - 5) )
             LAR_DIE("Package name exceeds maximum allowed length");
 

luci/trunk/contrib/lar/lar.h

@@ +1 @@
+#ifndef __LAR_H
+#define __LAR_H
+
 #include <stdio.h>
 #include <stdlib.h>
@@ -25 +28 @@
 #define LAR_FNAME_BUFFER 1024
 #define LAR_FNAME(s) char s[LAR_FNAME_BUFFER]
+
+#ifdef __WIN32__
+#define LAR_DIRSEP  '\\'
+#else
+#define LAR_DIRSEP  '/'
+#endif
 
 
@@ -77 +86 @@
 
 lar_member * lar_find_member( lar_archive *ar, const char *package );
+
+#endif
+