From 1422e9dc60bd795b0bf8d8877087ce1eb6ad6942 Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Sat, 15 Dec 2001 22:12:47 +0000
Subject: SF patch 493739 2 Bugfixes for 2.2c1 (RISC OS specific), from Dietmar
 Schwertberger. Bugfix candidate. """ RISCOS/Modules/getpath_riscos.c: Include
 trailing '\0' when using strncpy [copy strlen(...)+1 characters].

Lib/plat-riscos/riscospath.py:
Use riscosmodule.expand for os.path.abspath.
[fixes problems with site.py where
abspath("<Python$Dir>") returned
join(os.getcwd(), "<Python$Dir>") as e.g.
"SCSI::SCSI4.$.<Python$Dir>" because "<Python$Dir>"
wasn't recognised as an absolute path.]
"""
---
 RISCOS/Modules/getpath_riscos.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'RISCOS/Modules/getpath_riscos.c')

diff --git a/RISCOS/Modules/getpath_riscos.c b/RISCOS/Modules/getpath_riscos.c
index 5ac8b727e2..ce978c6c46 100644
--- a/RISCOS/Modules/getpath_riscos.c
+++ b/RISCOS/Modules/getpath_riscos.c
@@ -11,7 +11,7 @@ calculate_path()
 		int pathlen = strlen(pypath);
 		module_search_path = malloc(pathlen + 1);
 		if (module_search_path) 
-			strncpy(module_search_path, pypath, pathlen);
+			strncpy(module_search_path, pypath, pathlen + 1);
 		else {
 			fprintf(stderr, 
 				"Not enough memory for dynamic PYTHONPATH.\n"
-- 
cgit v1.2.1