mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix uninitialized-variable warning.

Browse Source 
In passing, add an Assert defending the presumption that bytes_left
is positive to start with.  (I'm not exactly convinced that using an
unsigned type was such a bright thing here, but let's at least do
this much.)
This commit is contained in:
Tom Lane 2014-11-25 15:16:49 -05:00
parent aedccb1f6f
commit d934a05234
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/utils/misc/guc.c
View File

@ -8741,9 +8741,10 @@ SerializeGUCState(Size maxsize, char *start_address)
Size actual_size; Size actual_size;
Size bytes_left; Size bytes_left;
int i; int i;
int i_role; int i_role = -1;
/* Reserve space for saving the actual size of the guc state */ /* Reserve space for saving the actual size of the guc state */
Assert(maxsize > sizeof(actual_size));
curptr = start_address + sizeof(actual_size); curptr = start_address + sizeof(actual_size);
bytes_left = maxsize - sizeof(actual_size); bytes_left = maxsize - sizeof(actual_size);
@ -8759,7 +8760,8 @@ SerializeGUCState(Size maxsize, char *start_address)
else else
serialize_variable(&curptr, &bytes_left, guc_variables[i]); serialize_variable(&curptr, &bytes_left, guc_variables[i]);
} }
serialize_variable(&curptr, &bytes_left, guc_variables[i_role]); if (i_role >= 0)
serialize_variable(&curptr, &bytes_left, guc_variables[i_role]);
/* Store actual size without assuming alignment of start_address. */ /* Store actual size without assuming alignment of start_address. */
actual_size = maxsize - bytes_left - sizeof(actual_size); actual_size = maxsize - bytes_left - sizeof(actual_size);