Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Jo-Philipp Wich 2009-04-06 18:16:04 +00:00
parent bfa91018ac
commit bf1cbdd838
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/lar/lar.c
View file

@ -183,7 +183,7 @@ lar_archive * lar_find_archive( const char *package )
for( len = 0; package[len] != '\0'; len++ )
{
if( len >= sizeof(buffer) )
if( len >= (sizeof(buffer) - 5) )
LAR_DIE("Package name exceeds maximum allowed length");
if( package[len] == '.' ) seg++;
@ -197,7 +197,7 @@ lar_archive * lar_find_archive( const char *package )
if( j < seg ) j++; else break;
}
buffer[i] = ( package[i] == '.' ) ? '/' : package[i];
buffer[i] = ( package[i] == '.' ) ? LAR_DIRSEP : package[i];
}
buffer[i+0] = '.'; buffer[i+1] = 'l'; buffer[i+2] = 'a';
@ -219,7 +219,7 @@ lar_member * lar_find_member( lar_archive *ar, const char *package )
for( len = 0; package[len] != '\0'; len++ )
{
if( len >= sizeof(buffer) )
if( len >= (sizeof(buffer) - 5) )
LAR_DIE("Package name exceeds maximum allowed length");
buffer[len] = ( package[len] == '.' ) ? '/' : package[len];

12
contrib/lar/lar.h
View file

@ -1,3 +1,6 @@
#ifndef __LAR_H
#define __LAR_H
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@ -25,6 +28,12 @@ int errno;
#define LAR_FNAME_BUFFER 1024
#define LAR_FNAME(s) char s[LAR_FNAME_BUFFER]
#ifdef __WIN32__
#define LAR_DIRSEP '\\'
#else
#define LAR_DIRSEP '/'
#endif
struct lar_index_item {
uint32_t noffset;
@ -76,3 +85,6 @@ int lar_close( lar_archive *ar );
lar_archive * lar_find_archive( const char *package );
lar_member * lar_find_member( lar_archive *ar, const char *package );
#endif