Skip to content

Commit 5014544

Browse files
committed
General: Fix file descriptor leak
* fclose's all files properly now. Should not cause errors after a long playing session.
1 parent 2c1520b commit 5014544

File tree

11 files changed

+26
-9
lines changed

11 files changed

+26
-9
lines changed

src/colours/weather_Timecycle.hh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,8 @@ struct WeatherRandomizer_Tunables
307307
m_Fields.pop_back ();
308308
}
309309
}
310+
311+
fclose (f);
310312
}
311313

312314
void

src/common/parser.hh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ private:
102102
m_Groups.back ().Weights.push_back (weight);
103103
}
104104
}
105+
106+
fclose(file);
105107
}
106108

107109
public:
@@ -183,6 +185,8 @@ private:
183185
m_List.Values.push_back (model);
184186
m_List.Weights.push_back (weight);
185187
}
188+
189+
fclose (file);
186190
}
187191

188192
public:

src/debug/timecycle.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,7 @@ struct TimecycleRandomizerTunables
480480
}
481481
}
482482
}
483+
fclose (file);
483484
}
484485
};
485486

src/misc/ramps.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ class RampRandomizer
8585
info.Model = rage::atStringHash (ModelName);
8686
sm_RampInfos.push_back (info);
8787
}
88+
89+
fclose (f);
8890
}
8991

9092
/*******************************************************/

src/misc/scaleform.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ class ScaleformRandomizer
135135
m_MissionFailInsults.back () += ' ';
136136
}
137137

138+
fclose (insultsFile);
138139
return;
139140
}
140141

src/mission/missions_Data.hh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,5 +108,7 @@ public:
108108
Rainbomizer::Logger::LogMessage (
109109
"Error reading Missions.txt line: %s", line);
110110
}
111+
112+
fclose (file);
111113
}
112114
};

src/peds/peds_Streaming.hh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ class PedRandomizer_Streaming
8181
line[strcspn (line, "\n")] = 0;
8282
out.push_back (rage::atStringHash (line));
8383
}
84+
85+
fclose (f);
8486
}
8587

8688
/*******************************************************/

src/sounds/voicelines.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,7 @@ class VoiceLineRandomizer
410410
rage::atPartialStringHash (context),
411411
subtitle});
412412
}
413+
fclose (soundsFile);
413414
Rainbomizer::Logger::LogMessage ("Initialised %d voice lines",
414415
mSubtitles.size ());
415416
}

src/vehicles/traffic.cc

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class TrafficRandomizer
2424
bool EnableBoats = true;
2525

2626
bool DisableBigVehicles = false;
27+
bool DisableLoadingTraffic = false;
2728
} m_Config;
2829

2930
return m_Config;
@@ -57,6 +58,7 @@ class TrafficRandomizer
5758
aList.push_back (rage::atStringHash (line));
5859
}
5960

61+
fclose (f);
6062
return &aList;
6163
}
6264

@@ -80,6 +82,9 @@ class TrafficRandomizer
8082
/*******************************************************/
8183
static uint32_t __fastcall RandomizeCarToLoad (CStreaming *inst)
8284
{
85+
if (Config ().DisableLoadingTraffic)
86+
return 65535;
87+
8388
auto &vehicles = Rainbomizer::Common::GetVehicleHashes ();
8489
for (int i = 0; i < 16; i++)
8590
{
@@ -102,14 +107,8 @@ class TrafficRandomizer
102107
/*******************************************************/
103108
TrafficRandomizer ()
104109
{
105-
if (!ConfigManager::ReadConfig (
106-
"TrafficRandomizer",
107-
std::pair ("EnablePlanes", &Config ().EnablePlanes),
108-
std::pair ("EnableHelis", &Config ().EnableHelis),
109-
std::pair ("EnableBoats", &Config ().EnableBoats),
110-
std::pair ("DisableBigVehicles",
111-
&Config ().DisableBigVehicles)))
112-
return;
110+
RB_C_DO_CONFIG ("TrafficRandomizer", EnablePlanes, EnableHelis,
111+
EnableBoats, DisableBigVehicles, DisableLoadingTraffic);
113112

114113
if (!Config ().EnableBoats)
115114
Rainbomizer::Logger::LogMessage ("Boat hater detected!!");

src/vehicles/vehicle_cacheMgr.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,9 @@ VehicleModelInfoCacheMgr::InitCache ()
101101
= Rainbomizer::Common::GetRainbomizerDataFile ("VehInfo.cache", "rb");
102102

103103
if (!cacheFile || !ReadCacheFile (cacheFile))
104-
return GenerateCache ();
104+
GenerateCache ();
105+
106+
fclose (cacheFile);
105107
}
106108

107109
/*******************************************************/

0 commit comments

Comments
 (0)