summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2012-04-18 18:54:15 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2012-04-18 18:54:15 +0000
commitb4977fbdcc096b6ab354fee7bb0deb37515de4a7 (patch)
tree46a0925c0c83f660b332ee1e2454aa190c6f1c8f
parent692f223d3ac8af1301b24337949a6ff63b1b98fc (diff)
downloadnetsurf-b4977fbdcc096b6ab354fee7bb0deb37515de4a7.tar.gz
netsurf-b4977fbdcc096b6ab354fee7bb0deb37515de4a7.tar.bz2
Replace strncpy with strlcpy, as strncpy is not guaranteed to be
NULL-terminated. (thx Colin Wenzel) svn path=/trunk/netsurf/; revision=13881
-rwxr-xr-xamiga/gui.c4
-rwxr-xr-xamiga/misc.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/amiga/gui.c b/amiga/gui.c
index bf2f09b12..a4d55dc87 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -867,13 +867,13 @@ int main(int argc, char** argv)
ami_gui_splash_close(splash_window);
- strncpy(script, nsoption_charp(arexx_dir), 1024);
+ strlcpy(script, nsoption_charp(arexx_dir), 1024);
AddPart(script, nsoption_charp(arexx_startup), 1024);
ami_arexx_execute(script);
netsurf_main_loop();
- strncpy(script, nsoption_charp(arexx_dir), 1024);
+ strlcpy(script, nsoption_charp(arexx_dir), 1024);
AddPart(script, nsoption_charp(arexx_shutdown), 1024);
ami_arexx_execute(script);
diff --git a/amiga/misc.c b/amiga/misc.c
index e2f566f94..bfb281718 100755
--- a/amiga/misc.c
+++ b/amiga/misc.c
@@ -115,7 +115,7 @@ char *path_to_url(const char *path)
DevNameFromLock(lock, newpath, sizeof newpath, DN_FULLPATH);
UnLock(lock);
}
- else strncpy(newpath, path, sizeof newpath);
+ else strlcpy(newpath, path, sizeof newpath);
r = malloc(strlen(newpath) + SLEN("file:///") + 1);