From ab302e985b4132c8d81cdf32fcc688ab1951d8e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Fri, 25 Jan 2013 09:31:44 +0000 Subject: [PATCH 1/3] fix warning --- C/save.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/C/save.c b/C/save.c index 8b9ab9ec5..de1eefe85 100755 --- a/C/save.c +++ b/C/save.c @@ -685,8 +685,8 @@ check_header(CELL *info, CELL *ATrail, CELL *AStack, CELL *AHeap USES_REGS) if (strcmp(pp, msg) != 0) { LOCAL_ErrorMessage = LOCAL_ErrorSay; strncpy(LOCAL_ErrorMessage, "saved state ", MAX_ERROR_MSG_SIZE); - strncat(LOCAL_ErrorMessage, LOCAL_FileNameBuf, MAX_ERROR_MSG_SIZE); - strncat(LOCAL_ErrorMessage, " failed to match version ID", MAX_ERROR_MSG_SIZE); + strncat(LOCAL_ErrorMessage, LOCAL_FileNameBuf, MAX_ERROR_MSG_SIZE-1); + strncat(LOCAL_ErrorMessage, " failed to match version ID", MAX_ERROR_MSG_SIZE-1); LOCAL_Error_TYPE = CONSISTENCY_ERROR; return FAIL_RESTORE; } From c758d23ab4f9f8006abe31c7d0143397b752922c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Fri, 25 Jan 2013 09:32:17 +0000 Subject: [PATCH 2/3] upstream swi code --- packages/odbc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/odbc b/packages/odbc index 761bb9831..d9a8cdd6a 160000 --- a/packages/odbc +++ b/packages/odbc @@ -1 +1 @@ -Subproject commit 761bb9831f7221207949176de729711d0018e511 +Subproject commit d9a8cdd6ac472fa2338f7d66cc18e5e21f0ed94c From bbaf1f13d4bb72d9dbde14fa2f4dfdd8bf05ccd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Fri, 25 Jan 2013 09:32:48 +0000 Subject: [PATCH 3/3] upstream --- packages/archive | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/archive b/packages/archive index 4445c093d..7984859c5 160000 --- a/packages/archive +++ b/packages/archive @@ -1 +1 @@ -Subproject commit 4445c093d08d0693899d8f3a3ac1b0842370d868 +Subproject commit 7984859c5739a7af6564fb890a28c32a98aa727e