mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2025-03-25 16:00:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

* libltdl/ltdl.c (find_file): fix endless loop condition

Browse Source 
(find_module): filename allocation was off by 1
This commit is contained in:
Alexandre Oliva 1999-01-27 07:41:15 +00:00 committed by Alexandre Oliva
parent dc07a72c9a
commit 0e57eec185
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
1999-01-27 Alexandre Oliva <oliva@dcc.unicamp.br>
* libltdl/ltdl.c (find_file): fix endless loop condition
(find_module): filename allocation was off by 1
* libltdl/Makefile.am (distclean-local): renamed from
distclean-hook, that didn't work

18
libltdl/ltdl.c
View File

@ -813,7 +813,7 @@ find_module (handle, dir, libdir, dlname, old_name, installed)
if (installed && libdir) {
int ret;
char *filename = (char*)
malloc(strlen(libdir)+1+strlen(dlname));
malloc(strlen(libdir)+1+strlen(dlname)+1);
if (!filename) {
last_error = memory_error;
@ -832,7 +832,7 @@ find_module (handle, dir, libdir, dlname, old_name, installed)
int ret;
char *filename = (char*)
malloc((dir ? strlen(dir) : 0)
+ strlen(objdir) + strlen(dlname));
+ strlen(objdir) + strlen(dlname) + 1);
if (!filename) {
last_error = memory_error;
@ -854,7 +854,7 @@ find_module (handle, dir, libdir, dlname, old_name, installed)
int ret;
char *filename = (char*)
malloc((dir ? strlen(dir) : 0)
+ strlen(dlname));
+ strlen(dlname) + 1);
if (dir)
strcpy(filename, dir);
strcat(filename, dlname);
@ -880,21 +880,21 @@ find_file (basename, search_path, pdir, handle)
char *filename = 0;
int filenamesize = 0;
const char *cur, *next;
const char *next = search_path;
int lenbase = strlen(basename);
if (!search_path || !strlen(search_path)) {
if (!next || !*next) {
last_error = file_not_found_error;
return 0;
}
cur = search_path;
while (cur) {
while (next) {
int lendir;
const char *cur = next;
next = strchr(cur, ':');
if (!next)
next = cur + strlen(cur);
lendir = next - cur + 1;
lendir = next - cur;
if (*next == ':')
++next;
else