Skip to content

Commit 999a476

Browse files
pbatardpbatard
committed
[misc] fix coverity warnings
* Also improve error reporting * Also add libwdi_i.h to DLL project
1 parent befcdc6 commit 999a476

File tree

11 files changed

+28
-21
lines changed

11 files changed

+28
-21
lines changed

‎examples/wdi-simple.rc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#endif
88

99
VS_VERSION_INFO VERSIONINFO
10-
FILEVERSION 1,2,3,667
11-
PRODUCTVERSION 1,2,3,667
10+
FILEVERSION 1,2,3,668
11+
PRODUCTVERSION 1,2,3,668
1212
FILEFLAGSMASK 0x17L
1313
#ifdef _DEBUG
1414
FILEFLAGS 0x1L
@@ -25,13 +25,13 @@ BEGIN
2525
BEGIN
2626
VALUE "CompanyName", "akeo.ie"
2727
VALUE "FileDescription", "WDI-Simple"
28-
VALUE "FileVersion", "1.2.3.667"
28+
VALUE "FileVersion", "1.2.3.668"
2929
VALUE "InternalName", "WDI-Simple"
3030
VALUE "LegalCopyright", "� 2010-2014 Pete Batard (LGPL v3)"
3131
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
3232
VALUE "OriginalFilename", "wdi-simple.exe"
3333
VALUE "ProductName", "WDI-Simple"
34-
VALUE "ProductVersion", "1.2.3.667"
34+
VALUE "ProductVersion", "1.2.3.668"
3535
VALUE "Comments", "http://libwdi.akeo.ie"
3636
END
3737
END

‎examples/zadic.rc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ END
5656
//
5757

5858
VS_VERSION_INFO VERSIONINFO
59-
FILEVERSION 1,2,3,667
60-
PRODUCTVERSION 1,2,3,667
59+
FILEVERSION 1,2,3,668
60+
PRODUCTVERSION 1,2,3,668
6161
FILEFLAGSMASK 0x17L
6262
#ifdef _DEBUG
6363
FILEFLAGS 0x1L
@@ -74,13 +74,13 @@ BEGIN
7474
BEGIN
7575
VALUE "CompanyName", "akeo.ie"
7676
VALUE "FileDescription", "Zadic"
77-
VALUE "FileVersion", "1.2.3.667"
77+
VALUE "FileVersion", "1.2.3.668"
7878
VALUE "InternalName", "Zadic"
7979
VALUE "LegalCopyright", "� 2010-2014 Pete Batard (LGPL v3)"
8080
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
8181
VALUE "OriginalFilename", "zadic.exe"
8282
VALUE "ProductName", "Zadic"
83-
VALUE "ProductVersion", "1.2.3.667"
83+
VALUE "ProductVersion", "1.2.3.668"
8484
VALUE "Comments", "http://libwdi.akeo.ie"
8585
END
8686
END

‎examples/zadig.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
#define FIELD_ORANGE RGB(255,240,200)
6060
#define ARROW_GREEN RGB(92,228,65)
6161
#define ARROW_ORANGE RGB(253,143,56)
62-
#define APP_VERSION "Zadig 2.1.1.667"
62+
#define APP_VERSION "Zadig 2.1.1.668"
6363

6464
// These are used to flag end users about the driver they are going to replace
6565
enum driver_type {
@@ -197,6 +197,7 @@ static __inline HMODULE GetDLLHandle(char* szDLLName)
197197
{
198198
HANDLE h = GetModuleHandleA(szDLLName);
199199
if (h == NULL) {
200+
// coverity[alloc_fn][var_assign]
200201
h = LoadLibraryA(szDLLName);
201202
}
202203
return h;

‎examples/zadig.rc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,8 @@ END
248248
//
249249

250250
VS_VERSION_INFO VERSIONINFO
251-
FILEVERSION 2,1,1,667
252-
PRODUCTVERSION 2,1,1,667
251+
FILEVERSION 2,1,1,668
252+
PRODUCTVERSION 2,1,1,668
253253
FILEFLAGSMASK 0x17L
254254
#ifdef _DEBUG
255255
FILEFLAGS 0x1L
@@ -266,13 +266,13 @@ BEGIN
266266
BEGIN
267267
VALUE "CompanyName", "akeo.ie"
268268
VALUE "FileDescription", "Zadig"
269-
VALUE "FileVersion", "2.1.1.667"
269+
VALUE "FileVersion", "2.1.1.668"
270270
VALUE "InternalName", "Zadig"
271271
VALUE "LegalCopyright", "� 2010-2014 Pete Batard (GPL v3)"
272272
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
273273
VALUE "OriginalFilename", "zadig.exe"
274274
VALUE "ProductName", "Zadig"
275-
VALUE "ProductVersion", "2.1.1.667"
275+
VALUE "ProductVersion", "2.1.1.668"
276276
VALUE "Comments", "http://libwdi.akeo.ie"
277277
END
278278
END

‎libwdi/.msvc/libwdi_dll.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ embedder embedded.h</Command>
190190
<ClInclude Include="..\..\msvc\config.h" />
191191
<ClInclude Include="..\installer.h" />
192192
<ClInclude Include="..\libwdi.h" />
193+
<ClInclude Include="..\libwdi_i.h" />
193194
<ClInclude Include="..\logging.h" />
194195
<ClInclude Include="..\msapi_utf8.h" />
195196
<ClInclude Include="..\mssign32.h" />

‎libwdi/.msvc/libwdi_dll.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
<ClInclude Include="..\mssign32.h">
5959
<Filter>Header Files</Filter>
6060
</ClInclude>
61+
<ClInclude Include="..\libwdi_i.h">
62+
<Filter>Header Files</Filter>
63+
</ClInclude>
6164
</ItemGroup>
6265
<ItemGroup>
6366
<None Include="..\libwdi.def">

‎libwdi/installer.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ static __inline HMODULE GetDLLHandle(char* szDLLName)
103103
{
104104
HANDLE h = GetModuleHandleA(szDLLName);
105105
if (h == NULL) {
106+
// coverity[alloc_fn][var_assign]
106107
h = LoadLibraryA(szDLLName);
107108
}
108109
return h;

‎libwdi/libwdi.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ static char err_string[STR_BUFFER_SIZE];
151151

152152
error_code = retval?retval:GetLastError();
153153

154-
safe_sprintf(err_string, STR_BUFFER_SIZE, "[#%X] ", error_code);
154+
safe_sprintf(err_string, STR_BUFFER_SIZE, "[#%08X] ", error_code);
155155

156156
size = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code,
157157
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), &err_string[safe_strlen(err_string)],
@@ -1078,7 +1078,8 @@ int LIBWDI_API wdi_prepare_driver(struct wdi_device_info* device_info, const cha
10781078
}
10791079

10801080
// Populate the inf and cat names & paths
1081-
if ( (safe_strlen(path) + safe_strlen(inf_name)) > (MAX_PATH - 2)) {
1081+
if ( (strlen(path) >= MAX_PATH) || (strlen(inf_name) >= MAX_PATH) ||
1082+
((strlen(path) + strlen(inf_name)) > (MAX_PATH - 2)) ) {
10821083
wdi_err("qualified path for inf file is too long: '%s\\%s", path, inf_name);
10831084
MUTEX_RETURN(WDI_ERROR_RESOURCE);
10841085
}

‎libwdi/libwdi.rc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ END
5050
//
5151

5252
VS_VERSION_INFO VERSIONINFO
53-
FILEVERSION 1,2,3,667
54-
PRODUCTVERSION 1,2,3,667
53+
FILEVERSION 1,2,3,668
54+
PRODUCTVERSION 1,2,3,668
5555
FILEFLAGSMASK 0x17L
5656
#ifdef _DEBUG
5757
FILEFLAGS 0x1L
@@ -68,13 +68,13 @@ BEGIN
6868
BEGIN
6969
VALUE "CompanyName", "akeo.ie"
7070
VALUE "FileDescription", "libwdi: Windows Driver Installer Library"
71-
VALUE "FileVersion", "1.2.3.667"
71+
VALUE "FileVersion", "1.2.3.668"
7272
VALUE "InternalName", "libwdi"
7373
VALUE "LegalCopyright", "� 2010-2014 Pete Batard (LGPL v3)"
7474
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
7575
VALUE "OriginalFilename", "libwdi"
7676
VALUE "ProductName", "libwdi"
77-
VALUE "ProductVersion", "1.2.3.667"
77+
VALUE "ProductVersion", "1.2.3.668"
7878
VALUE "Comments", "http://libwdi.akeo.ie"
7979
END
8080
END

‎libwdi/pki.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1095,7 +1095,7 @@ static BOOL GetFullPath(LPCSTR szSrc, LPSTR szDst, DWORD dwDstSize)
10951095
HandleSeparators(szSrcCopy);
10961096
r = GetFullPathNameA(szSrcCopy, (DWORD)dwDstSize, szDst, NULL);
10971097
free(szSrcCopy);
1098-
if ((r != 0) || (r <= dwDstSize)) {
1098+
if ((r != 0) && (r <= dwDstSize)) {
10991099
return TRUE;
11001100
}
11011101
fprintf(stderr, "Unable to get full path for '%s'.\n", szSrc);

0 commit comments

Comments
 (0)