Attached the proposed patch
Gianfranco
>________________________________
> Da: Oliver Bock <[email protected]>
>A: Gianfranco Costamagna <[email protected]>
>Cc: "[email protected]" <[email protected]>
>Inviato: Martedì 23 Aprile 2013 14:25
>Oggetto: Re: [boinc_dev] boinc_dev Digest, Vol 107, Issue 6
>
>
>On 4/23/13 14:23 , Oliver Bock wrote:
>> On 4/23/13 14:09 , Gianfranco Costamagna wrote:
>>> Sorry Oliver, what about sending patches in the debian format?
>>> I use dpkg-source for creating them, but I can use format patch too.
>>
>> Regular patches don't contain any meta data, like author and datetime
>> information. git format-patch (followed by git am) does. It's somewhat
>> important to be able to attribute a given commit/patch to the original
>> author if, say, in a year from now someone needs additional information
>> about its content/implementation. You want to be able to ask the patch's
>> original author about it.
>
>Also, you might want to get credit for your work :-)
>
>
>
>
From 0ed4aa22b8425184fce7b3644865e9ab2c5fb177 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <[email protected]>
Date: Tue, 23 Apr 2013 14:59:45 +0200
Subject: [PATCH] Fixed FTBFS with gcc hardening flags enabled
---
client/cs_account.cpp | 2 +-
client/cs_benchmark.cpp | 2 +-
client/main.cpp | 12 ++++++------
client/work_fetch.cpp | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/client/cs_account.cpp b/client/cs_account.cpp
index 04d1981..f3693c6 100644
--- a/client/cs_account.cpp
+++ b/client/cs_account.cpp
@@ -79,7 +79,7 @@ int PROJECT::write_account_file() {
fprintf(f, "<project_preferences>\n%s</project_preferences>\n",
project_prefs.c_str()
);
- fprintf(f, gui_urls.c_str());
+ fprintf(f, "%s" ,gui_urls.c_str());
fprintf(f, "</account>\n");
fclose(f);
retval = boinc_rename(TEMP_ACCT_FILE_NAME, path);
diff --git a/client/cs_benchmark.cpp b/client/cs_benchmark.cpp
index d2b485b..e41302f 100644
--- a/client/cs_benchmark.cpp
+++ b/client/cs_benchmark.cpp
@@ -462,7 +462,7 @@ bool CLIENT_STATE::cpu_benchmarks_poll() {
}
ndone++;
if (benchmark_descs[i].error) {
- msg_printf(0, MSG_INFO, benchmark_descs[i].error_str);
+ msg_printf(0, MSG_INFO, "%s", benchmark_descs[i].error_str);
had_error = true;
}
}
diff --git a/client/main.cpp b/client/main.cpp
index c358280..4b64add 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -82,7 +82,7 @@ void log_message_startup(const char* msg) {
time_string, msg
);
if (!gstate.executing_as_daemon) {
- fprintf(stdout, evt_msg);
+ fprintf(stdout, "%s", evt_msg);
} else {
#ifdef _WIN32
LogEventInfoMessage(evt_msg);
@@ -91,7 +91,7 @@ void log_message_startup(const char* msg) {
#elif defined (ANDROID)
__android_log_print(ANDROID_LOG_INFO, "BOINC", evt_msg);
#else
- syslog(LOG_DAEMON|LOG_INFO, evt_msg);
+ syslog(LOG_DAEMON|LOG_INFO, "%s", evt_msg);
#endif
}
}
@@ -115,7 +115,7 @@ void log_message_error(const char* msg) {
);
#endif
if (!gstate.executing_as_daemon) {
- fprintf(stderr, evt_msg);
+ fprintf(stderr, "%s", evt_msg);
} else {
#ifdef _WIN32
LogEventErrorMessage(evt_msg);
@@ -124,7 +124,7 @@ void log_message_error(const char* msg) {
#elif defined (ANDROID)
__android_log_print(ANDROID_LOG_ERROR, "BOINC", evt_msg);
#else
- syslog(LOG_DAEMON|LOG_ERR, evt_msg);
+ syslog(LOG_DAEMON|LOG_ERR, "%s", evt_msg);
#endif
}
}
@@ -138,7 +138,7 @@ void log_message_error(const char* msg, int error_code) {
time_string, msg, error_code
);
if (!gstate.executing_as_daemon) {
- fprintf(stderr, evt_msg);
+ fprintf(stderr, "%s", evt_msg);
} else {
#ifdef _WIN32
LogEventErrorMessage(evt_msg);
@@ -147,7 +147,7 @@ void log_message_error(const char* msg, int error_code) {
#elif defined (ANDROID)
__android_log_print(ANDROID_LOG_ERROR, "BOINC", evt_msg);
#else
- syslog(LOG_DAEMON|LOG_ERR, evt_msg);
+ syslog(LOG_DAEMON|LOG_ERR, "%s", evt_msg);
#endif
}
}
diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp
index 4022ce2..ebf3d3c 100644
--- a/client/work_fetch.cpp
+++ b/client/work_fetch.cpp
@@ -848,7 +848,7 @@ void WORK_FETCH::write_request(FILE* f, PROJECT* p) {
if (log_flags.work_fetch_debug) {
char buf[256];
request_string(buf);
- msg_printf(p, MSG_INFO, buf);
+ msg_printf(p, MSG_INFO, "%s", buf);
}
}
--
1.7.10.4
_______________________________________________
boinc_dev mailing list
[email protected]
http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev
To unsubscribe, visit the above URL and
(near bottom of page) enter your email address.
