Skip to content

Commit b31d0b7

Browse files
committed
Fix warning C4703
1 parent c046bce commit b31d0b7

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

phlib/kph.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ NTSTATUS KphConnect2Ex(
107107
{
108108
NTSTATUS status;
109109
SC_HANDLE scmHandle;
110-
SC_HANDLE serviceHandle;
110+
SC_HANDLE serviceHandle = NULL;
111111
BOOLEAN started = FALSE;
112112
BOOLEAN created = FALSE;
113113

phlib/native.c

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3936,9 +3936,9 @@ BOOLEAN NTAPI PhpEnumProcessModulesCallback(
39363936
BOOLEAN cont = FALSE;
39373937
PPH_STRING mappedFileName = NULL;
39383938
PWSTR fullDllNameOriginal;
3939-
PWSTR fullDllNameBuffer;
3939+
PWSTR fullDllNameBuffer = NULL;
39403940
PWSTR baseDllNameOriginal;
3941-
PWSTR baseDllNameBuffer;
3941+
PWSTR baseDllNameBuffer = NULL;
39423942

39433943
if (!parameters)
39443944
return TRUE;
@@ -4057,8 +4057,8 @@ BOOLEAN NTAPI PhpEnumProcessModulesCallback(
40574057
}
40584058
else
40594059
{
4060-
PhFree(fullDllNameBuffer);
4061-
4060+
if (fullDllNameBuffer)
4061+
PhFree(fullDllNameBuffer);
40624062
if (baseDllNameBuffer)
40634063
PhFree(baseDllNameBuffer);
40644064
}
@@ -4298,8 +4298,8 @@ BOOLEAN NTAPI PhpEnumProcessModules32Callback(
42984298
BOOLEAN cont;
42994299
LDR_DATA_TABLE_ENTRY nativeEntry;
43004300
PPH_STRING mappedFileName;
4301-
PWSTR baseDllNameBuffer;
4302-
PWSTR fullDllNameBuffer;
4301+
PWSTR baseDllNameBuffer = NULL;
4302+
PWSTR fullDllNameBuffer = NULL;
43034303
PH_STRINGREF fullDllName;
43044304
PH_STRINGREF systemRootString;
43054305

@@ -4451,8 +4451,10 @@ BOOLEAN NTAPI PhpEnumProcessModules32Callback(
44514451
}
44524452
else
44534453
{
4454-
PhFree(baseDllNameBuffer);
4455-
PhFree(fullDllNameBuffer);
4454+
if (baseDllNameBuffer)
4455+
PhFree(baseDllNameBuffer);
4456+
if (fullDllNameBuffer)
4457+
PhFree(fullDllNameBuffer);
44564458
}
44574459

44584460
return cont;

phlib/symprv.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,8 +429,7 @@ BOOLEAN PhGetLineFromAddress(
429429

430430
if (result)
431431
fileName = PhCreateString(line.FileName);
432-
433-
if (!result)
432+
else
434433
return FALSE;
435434

436435
*FileName = fileName;

phlib/treenew.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5600,12 +5600,10 @@ VOID PhTnpDrawCell(
56005600
textRect.left += SmallIconWidth + TNP_ICON_RIGHT_PADDING;
56015601
}
56025602

5603-
if (needsClip)
5603+
if (needsClip && oldClipRegion)
56045604
{
56055605
SelectClipRgn(hdc, oldClipRegion);
5606-
5607-
if (oldClipRegion)
5608-
DeleteRgn(oldClipRegion);
5606+
DeleteRgn(oldClipRegion);
56095607
}
56105608

56115609
if (textRect.left > textRect.right)

0 commit comments

Comments
 (0)