diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-02-27 09:51:27 +0300 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-02-27 09:57:32 +0300 |
| commit | 28721aae7257d6f9d70aeb6c6dc86f9004926004 (patch) | |
| tree | a6623be7f93be03c430739eeb46ae17f9e827b40 /src/Native/Runtime/RhConfig.cpp | |
| parent | d7be9c48bb4e7ba780efd90d320c010f1b25694a (diff) | |
| parent | 4efd23fdc3571099ac64322253f01dd3dd40cbc2 (diff) | |
Merge remote-tracking branch 'upstream/nmirror' into nmirror-merge
Conflicts:
src/Native/Runtime/PalRedhawkFunctions.h
src/Native/Runtime/RhConfig.cpp
src/Native/Runtime/RhConfig.h
src/Native/Runtime/gcrhenv.cpp
src/Native/gc/env/gcenv.base.h
Diffstat (limited to 'src/Native/Runtime/RhConfig.cpp')
| -rw-r--r-- | src/Native/Runtime/RhConfig.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Native/Runtime/RhConfig.cpp b/src/Native/Runtime/RhConfig.cpp index 5afa7d5f5..2fa93a9a8 100644 --- a/src/Native/Runtime/RhConfig.cpp +++ b/src/Native/Runtime/RhConfig.cpp @@ -70,7 +70,7 @@ UInt32 RhConfig::ReadConfigValue(_In_z_ const TCHAR *wszName, UInt32 uiDefaultVa //if the file is not avaliable, or unreadable zero will always be returned //cchOuputBuffer is the maximum number of characters to write to outputBuffer //cchOutputBuffer must be a size >= CONFIG_VAL_MAXLEN + 1 -UInt32 RhConfig::GetIniVariable(_In_z_ const TCHAR* configName, _Out_writes_all_(cchBuff) TCHAR* outputBuffer, _In_ UInt32 cchOuputBuffer) +UInt32 RhConfig::GetIniVariable(_In_z_ const TCHAR* configName, _Out_writes_all_(cchOuputBuffer) TCHAR* outputBuffer, _In_ UInt32 cchOuputBuffer) { //the buffer needs to be big enough to read the value buffer + null terminator if (cchOuputBuffer < CONFIG_VAL_MAXLEN + 1) |