Unverified Commit 276a0937 authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo Committed by GitHub
Browse files

Merge pull request #6662 from oranagra/fix_hz_div0

init server.hz early to avoid div by 0 during config file loading
parents ba287380 ef6e263f
...@@ -2266,6 +2266,7 @@ void createSharedObjects(void) { ...@@ -2266,6 +2266,7 @@ void createSharedObjects(void) {
void initServerConfig(void) { void initServerConfig(void) {
int j; int j;
server.hz = CONFIG_DEFAULT_HZ;
updateCachedTime(1); updateCachedTime(1);
getRandomHexChars(server.runid,CONFIG_RUN_ID_SIZE); getRandomHexChars(server.runid,CONFIG_RUN_ID_SIZE);
server.runid[CONFIG_RUN_ID_SIZE] = '\0'; server.runid[CONFIG_RUN_ID_SIZE] = '\0';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment