Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Merge pull request #4866 from computezrmle/vboxwrapper_replace_sprintf 

[vboxwrapper] Replace sprintf with snprintf
This commit is contained in:
Vitalii Koshura 2022-08-04 12:31:43 +02:00 committed by GitHub
parent 0709610faa 35b4d7b02d
commit 76dffd0dda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
samples/vboxwrapper/vbox_vboxmanage.cpp
View File

@ -224,7 +224,7 @@ namespace vboxmanage {
// Tweak the VM's Memory Size // Tweak the VM's Memory Size
// //
vboxlog_msg("Setting Memory Size for VM. (%dMB)", (int)memory_size_mb); vboxlog_msg("Setting Memory Size for VM. (%dMB)", (int)memory_size_mb);
sprintf(buf, "%d", (int)memory_size_mb); snprintf(buf, sizeof(buf), "%d", (int)memory_size_mb);
command = "modifyvm \"" + vm_name + "\" "; command = "modifyvm \"" + vm_name + "\" ";
command += "--memory " + string(buf) + " "; command += "--memory " + string(buf) + " ";
@ -259,7 +259,7 @@ namespace vboxmanage {
// Tweak the VM's Graphics Controller Options // Tweak the VM's Graphics Controller Options
// //
vboxlog_msg("Setting Graphics Controller Options for VM."); vboxlog_msg("Setting Graphics Controller Options for VM.");
sprintf(buf, "%d", (int)vram_size_mb); snprintf(buf, sizeof(buf), "%d", (int)vram_size_mb);
command = "modifyvm \"" + vm_name + "\" "; command = "modifyvm \"" + vm_name + "\" ";
command += "--vram " + string(buf) + " "; command += "--vram " + string(buf) + " ";
@ -768,7 +768,7 @@ namespace vboxmanage {
// Add new firewall rule // Add new firewall rule
// //
sprintf(buf, ",tcp,%s,%d,,%d", snprintf(buf, sizeof(buf), ",tcp,%s,%d,,%d",
pf.is_remote?"":"127.0.0.1", pf.is_remote?"":"127.0.0.1",
pf.host_port, pf.guest_port pf.host_port, pf.guest_port
); );
@ -790,7 +790,7 @@ namespace vboxmanage {
retval = boinc_get_port(false, rd_host_port); retval = boinc_get_port(false, rd_host_port);
if (retval) return retval; if (retval) return retval;
sprintf(buf, "%d", rd_host_port); snprintf(buf, sizeof(buf), "%d", rd_host_port);
command = "modifyvm \"" + vm_name + "\" "; command = "modifyvm \"" + vm_name + "\" ";
command += "--vrde on "; command += "--vrde on ";
command += "--vrdeextpack default "; command += "--vrdeextpack default ";
@ -1533,7 +1533,7 @@ namespace vboxmanage {
pause(); pause();
// Create new snapshot // Create new snapshot
sprintf(buf, "%d", (int)elapsed_time); snprintf(buf, sizeof(buf), "%d", (int)elapsed_time);
command = "snapshot \"" + vm_name + "\" "; command = "snapshot \"" + vm_name + "\" ";
command += "take boinc_"; command += "take boinc_";
command += buf; command += buf;
@ -2161,7 +2161,7 @@ namespace vboxmanage {
// the arg to controlvm is percentage // the arg to controlvm is percentage
// //
vboxlog_msg("Setting CPU throttle for VM. (%d%%)", percentage); vboxlog_msg("Setting CPU throttle for VM. (%d%%)", percentage);
sprintf(buf, "%d", percentage); snprintf(buf, sizeof(buf), "%d", percentage);
command = "controlvm \"" + vm_name + "\" "; command = "controlvm \"" + vm_name + "\" ";
command += "cpuexecutioncap "; command += "cpuexecutioncap ";
command += buf; command += buf;
@ -2198,7 +2198,7 @@ namespace vboxmanage {
retval = vbm_popen(command, output, "network throttle (set default value)"); retval = vbm_popen(command, output, "network throttle (set default value)");
if (retval) return retval; if (retval) return retval;
} else { } else {
sprintf(buf, "%d", kilobytes); snprintf(buf, sizeof(buf), "%d", kilobytes);
command = "bandwidthctl \"" + vm_name + "\" "; command = "bandwidthctl \"" + vm_name + "\" ";
command += "set \"" + vm_name + "_net\" "; command += "set \"" + vm_name + "_net\" ";
command += "--limit "; command += "--limit ";
@ -2211,7 +2211,7 @@ namespace vboxmanage {
} else { } else {
sprintf(buf, "%d", kilobytes); snprintf(buf, sizeof(buf), "%d", kilobytes);
command = "modifyvm \"" + vm_name + "\" "; command = "modifyvm \"" + vm_name + "\" ";
command += "--nicspeed1 "; command += "--nicspeed1 ";
command += buf; command += buf;

46
samples/vboxwrapper/vboxwrapper.cpp
View File

@ -92,20 +92,20 @@ using std::string;
bool shared_file_exists(std::string& filename) { bool shared_file_exists(std::string& filename) {
char path[MAXPATHLEN]; char path[MAXPATHLEN];
sprintf(path, "shared/%s", filename.c_str()); snprintf(path, sizeof(path), "shared/%s", filename.c_str());
if (filename.size() && boinc_file_exists(path)) return true; if (filename.size() && boinc_file_exists(path)) return true;
return false; return false;
} }
void shared_delete_file(std::string& filename) { void shared_delete_file(std::string& filename) {
char path[MAXPATHLEN]; char path[MAXPATHLEN];
sprintf(path, "shared/%s", filename.c_str()); snprintf(path, sizeof(path), "shared/%s", filename.c_str());
boinc_delete_file(path); boinc_delete_file(path);
} }
int shared_stat(std::string& filename, struct stat* stat_file) { int shared_stat(std::string& filename, struct stat* stat_file) {
char path[MAXPATHLEN]; char path[MAXPATHLEN];
sprintf(path, "shared/%s", filename.c_str()); snprintf(path, sizeof(path), "shared/%s", filename.c_str());
return stat(path, stat_file); return stat(path, stat_file);
} }
@ -114,7 +114,7 @@ bool read_fraction_done(double& frac_done, VBOX_VM& vm) {
char buf[256]; char buf[256];
double temp, frac = 0; double temp, frac = 0;
sprintf(path, "shared/%s", vm.fraction_done_filename.c_str()); snprintf(path, sizeof(path), "shared/%s", vm.fraction_done_filename.c_str());
FILE* f = fopen(path, "r"); FILE* f = fopen(path, "r");
if (!f) return false; if (!f) return false;
@ -147,7 +147,7 @@ void read_completion_file_info(unsigned long& exit_code, bool& is_notice, string
exit_code = 0; exit_code = 0;
message = ""; message = "";
sprintf(path, "shared/%s", vm.completion_trigger_file.c_str()); snprintf(path, sizeof(path), "shared/%s", vm.completion_trigger_file.c_str());
FILE* f = fopen(path, "r"); FILE* f = fopen(path, "r");
if (f) { if (f) {
if (fgets(buf, 1024, f) != NULL) { if (fgets(buf, 1024, f) != NULL) {
@ -170,7 +170,7 @@ void read_temporary_exit_file_info(int& temp_delay, bool& is_notice, string& mes
temp_delay = 0; temp_delay = 0;
message = ""; message = "";
sprintf(path, "shared/%s", vm.temporary_exit_trigger_file.c_str()); snprintf(path, sizeof(path), "shared/%s", vm.temporary_exit_trigger_file.c_str());
FILE* f = fopen(path, "r"); FILE* f = fopen(path, "r");
if (f) { if (f) {
if (fgets(buf, 1024, f) != NULL) { if (fgets(buf, 1024, f) != NULL) {
@ -249,16 +249,16 @@ void set_floppy_image(APP_INIT_DATA& aid, VBOX_VM& vm) {
scratch = "BOINC_USERNAME=" + string(aid.user_name) + "\n"; scratch = "BOINC_USERNAME=" + string(aid.user_name) + "\n";
scratch += "BOINC_AUTHENTICATOR=" + string(aid.authenticator) + "\n"; scratch += "BOINC_AUTHENTICATOR=" + string(aid.authenticator) + "\n";
sprintf(buf, "%d", aid.userid); snprintf(buf, sizeof(buf), "%d", aid.userid);
scratch += "BOINC_USERID=" + string(buf) + "\n"; scratch += "BOINC_USERID=" + string(buf) + "\n";
sprintf(buf, "%d", aid.hostid); snprintf(buf, sizeof(buf), "%d", aid.hostid);
scratch += "BOINC_HOSTID=" + string(buf) + "\n"; scratch += "BOINC_HOSTID=" + string(buf) + "\n";
sprintf(buf, "%.17g", aid.user_total_credit); snprintf(buf, sizeof(buf), "%.17g", aid.user_total_credit);
scratch += "BOINC_USER_TOTAL_CREDIT=" + string(buf) + "\n"; scratch += "BOINC_USER_TOTAL_CREDIT=" + string(buf) + "\n";
sprintf(buf, "%.17g", aid.host_total_credit); snprintf(buf, sizeof(buf), "%.17g", aid.host_total_credit);
scratch += "BOINC_HOST_TOTAL_CREDIT=" + string(buf) + "\n"; scratch += "BOINC_HOST_TOTAL_CREDIT=" + string(buf) + "\n";
} }
vm.write_floppy(scratch); vm.write_floppy(scratch);
@ -270,7 +270,7 @@ void set_floppy_image(APP_INIT_DATA& aid, VBOX_VM& vm) {
void report_web_graphics_url(VBOX_VM& vm) { void report_web_graphics_url(VBOX_VM& vm) {
char buf[256]; char buf[256];
if (vm.pf_host_port && !boinc_file_exists("graphics_app")) { if (vm.pf_host_port && !boinc_file_exists("graphics_app")) {
sprintf(buf, "http://localhost:%d", vm.pf_host_port); snprintf(buf, sizeof(buf), "http://localhost:%d", vm.pf_host_port);
vboxlog_msg("Detected: Web Application Enabled (%s)", buf); vboxlog_msg("Detected: Web Application Enabled (%s)", buf);
boinc_web_graphics_url(buf); boinc_web_graphics_url(buf);
} }
@ -281,7 +281,7 @@ void report_web_graphics_url(VBOX_VM& vm) {
void report_remote_desktop_info(VBOX_VM& vm) { void report_remote_desktop_info(VBOX_VM& vm) {
char buf[256]; char buf[256];
if (vm.rd_host_port) { if (vm.rd_host_port) {
sprintf(buf, "localhost:%d", vm.rd_host_port); snprintf(buf, sizeof(buf), "localhost:%d", vm.rd_host_port);
vboxlog_msg("Detected: Remote Desktop Enabled (%s)", buf); vboxlog_msg("Detected: Remote Desktop Enabled (%s)", buf);
boinc_remote_desktop_addr(buf); boinc_remote_desktop_addr(buf);
} }
@ -295,7 +295,7 @@ void check_trickle_triggers(VBOX_VM& vm) {
std::string text; std::string text;
for (unsigned int i=0; i<vm.trickle_trigger_files.size(); i++) { for (unsigned int i=0; i<vm.trickle_trigger_files.size(); i++) {
strcpy(filename, vm.trickle_trigger_files[i].c_str()); strcpy(filename, vm.trickle_trigger_files[i].c_str());
sprintf(path, "shared/%s", filename); snprintf(path, sizeof(path), "shared/%s", filename);
if (!boinc_file_exists(path)) continue; if (!boinc_file_exists(path)) continue;
vboxlog_msg("Reporting a trickle. (%s)", filename); vboxlog_msg("Reporting a trickle. (%s)", filename);
retval = read_file_string(path, text); retval = read_file_string(path, text);
@ -322,7 +322,7 @@ void check_intermediate_uploads(VBOX_VM& vm) {
char filename[256], path[MAXPATHLEN]; char filename[256], path[MAXPATHLEN];
for (unsigned int i=0; i<vm.intermediate_upload_files.size(); i++) { for (unsigned int i=0; i<vm.intermediate_upload_files.size(); i++) {
strcpy(filename, vm.intermediate_upload_files[i].file.c_str()); strcpy(filename, vm.intermediate_upload_files[i].file.c_str());
sprintf(path, "shared/%s", filename); snprintf(path, sizeof(path), "shared/%s", filename);
if (!boinc_file_exists(path)) continue; if (!boinc_file_exists(path)) continue;
if (!vm.intermediate_upload_files[i].reported && !vm.intermediate_upload_files[i].ignore) { if (!vm.intermediate_upload_files[i].reported && !vm.intermediate_upload_files[i].ignore) {
vboxlog_msg("Reporting an intermediate file. (%s)", vm.intermediate_upload_files[i].file.c_str()); vboxlog_msg("Reporting an intermediate file. (%s)", vm.intermediate_upload_files[i].file.c_str());
@ -354,7 +354,7 @@ void check_trickle_period(double& elapsed_time, double& trickle_period) {
} }
last_trickle_report_time = elapsed_time; last_trickle_report_time = elapsed_time;
vboxlog_msg("Status Report: Trickle-Up Event."); vboxlog_msg("Status Report: Trickle-Up Event.");
sprintf(buf, snprintf(buf, sizeof(buf),
"<cpu_time>%f</cpu_time>", last_trickle_report_time "<cpu_time>%f</cpu_time>", last_trickle_report_time
); );
int retval = boinc_send_trickle_up( int retval = boinc_send_trickle_up(
@ -629,7 +629,7 @@ int main(int argc, char** argv) {
pVM->vm_master_name += "standalone"; pVM->vm_master_name += "standalone";
pVM->vm_master_description = "standalone"; pVM->vm_master_description = "standalone";
if (pVM->enable_floppyio) { if (pVM->enable_floppyio) {
sprintf(buf, "%s.%s", snprintf(buf, sizeof(buf), "%s.%s",
FLOPPY_IMAGE_FILENAME, FLOPPY_IMAGE_FILENAME_EXTENSION FLOPPY_IMAGE_FILENAME, FLOPPY_IMAGE_FILENAME_EXTENSION
); );
pVM->floppy_image_filename = buf; pVM->floppy_image_filename = buf;
@ -638,13 +638,13 @@ int main(int argc, char** argv) {
pVM->vm_master_name += md5_string(std::string(aid.result_name)).substr(0, 16); pVM->vm_master_name += md5_string(std::string(aid.result_name)).substr(0, 16);
pVM->vm_master_description = aid.result_name; pVM->vm_master_description = aid.result_name;
if (vm_image) { if (vm_image) {
sprintf(buf, "%s_%d.%s", snprintf(buf, sizeof(buf), "%s_%d.%s",
IMAGE_FILENAME, vm_image, IMAGE_FILENAME_EXTENSION IMAGE_FILENAME, vm_image, IMAGE_FILENAME_EXTENSION
); );
pVM->image_filename = buf; pVM->image_filename = buf;
} }
if (pVM->enable_floppyio) { if (pVM->enable_floppyio) {
sprintf(buf, "%s_%d.%s", snprintf(buf, sizeof(buf), "%s_%d.%s",
FLOPPY_IMAGE_FILENAME, aid.slot, FLOPPY_IMAGE_FILENAME, aid.slot,
FLOPPY_IMAGE_FILENAME_EXTENSION FLOPPY_IMAGE_FILENAME_EXTENSION
); );
@ -666,9 +666,9 @@ int main(int argc, char** argv) {
ncpus = 32.0; ncpus = 32.0;
} }
if (ncpus) { if (ncpus) {
sprintf(buf, "%d", (int)ceil(ncpus)); snprintf(buf, sizeof(buf), "%d", (int)ceil(ncpus));
} else { } else {
sprintf(buf, "%d", (int)ceil(aid.ncpus)); snprintf(buf, sizeof(buf), "%d", (int)ceil(aid.ncpus));
} }
pVM->vm_cpu_count = buf; pVM->vm_cpu_count = buf;
} else { } else {
@ -1065,7 +1065,7 @@ int main(int argc, char** argv) {
if ((unsigned)retval == VBOX_E_INVALID_OBJECT_STATE) { if ((unsigned)retval == VBOX_E_INVALID_OBJECT_STATE) {
vboxlog_msg("ERROR: VM task failed to pause, rescheduling task for a later time."); vboxlog_msg("ERROR: VM task failed to pause, rescheduling task for a later time.");
pVM->poweroff(); pVM->poweroff();
sprintf(buf, snprintf(buf, sizeof(buf),
"VM suspend failed. Will exit and restart in %d sec.", "VM suspend failed. Will exit and restart in %d sec.",
RESTART_DELAY RESTART_DELAY
); );
@ -1078,7 +1078,7 @@ int main(int argc, char** argv) {
if ((unsigned)retval == VBOX_E_INVALID_OBJECT_STATE) { if ((unsigned)retval == VBOX_E_INVALID_OBJECT_STATE) {
vboxlog_msg("ERROR: VM task failed to resume, rescheduling task for a later time."); vboxlog_msg("ERROR: VM task failed to resume, rescheduling task for a later time.");
pVM->poweroff(); pVM->poweroff();
sprintf(buf, snprintf(buf, sizeof(buf),
"VM resume failed. Will exit and restart in %d sec.", "VM resume failed. Will exit and restart in %d sec.",
RESTART_DELAY RESTART_DELAY
); );
@ -1157,7 +1157,7 @@ int main(int argc, char** argv) {
// //
vboxlog_msg("ERROR: Checkpoint maintenance failed, rescheduling task for a later time. (%d)", retval); vboxlog_msg("ERROR: Checkpoint maintenance failed, rescheduling task for a later time. (%d)", retval);
pVM->poweroff(); pVM->poweroff();
sprintf(buf, snprintf(buf, sizeof(buf),
"VM snapshot failed. Will exit and restart in %d sec.", "VM snapshot failed. Will exit and restart in %d sec.",
RESTART_DELAY RESTART_DELAY
); );