GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-02-02 18:14:20 +00:00
Code Issues Releases Wiki Activity

Curl's global init can trample dynamically allocated data so do it before anything else.

Browse Source
This commit is contained in:
Con Kolivas 2011-07-19 00:14:58 +10:00
parent 1d27c119b6
commit 19b80d6db3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main.c
View File

@ -2158,6 +2158,11 @@ int main (int argc, char *argv[])
char name[256]; char name[256];
struct tm tm; struct tm tm;
/* This dangerous functions tramples random dynamically allocated
* variables so do it before anything at all */
if (unlikely(curl_global_init(CURL_GLOBAL_ALL)))
return 1;
if (unlikely(pthread_mutex_init(&hash_lock, NULL))) if (unlikely(pthread_mutex_init(&hash_lock, NULL)))
return 1; return 1;
if (unlikely(pthread_mutex_init(&qd_lock, NULL))) if (unlikely(pthread_mutex_init(&qd_lock, NULL)))
@ -2272,8 +2277,6 @@ int main (int argc, char *argv[])
} }
} }
if (unlikely(curl_global_init(CURL_GLOBAL_ALL)))
return 1;
#ifdef HAVE_SYSLOG_H #ifdef HAVE_SYSLOG_H
if (use_syslog) if (use_syslog)
openlog("cpuminer", LOG_PID, LOG_USER); openlog("cpuminer", LOG_PID, LOG_USER);
@ -2472,7 +2475,6 @@ int main (int argc, char *argv[])
applog(LOG_INFO, "workio thread dead, exiting."); applog(LOG_INFO, "workio thread dead, exiting.");
gettimeofday(&total_tv_end, NULL); gettimeofday(&total_tv_end, NULL);
curl_global_cleanup();
disable_curses(); disable_curses();
if (!opt_quiet && successful_connect) if (!opt_quiet && successful_connect)
print_summary(); print_summary();
@ -2482,6 +2484,7 @@ int main (int argc, char *argv[])
if (opt_n_threads) if (opt_n_threads)
free(cpus); free(cpus);
curl_global_cleanup();
return 0; return 0;
} }