i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If fileDescriptor is not retrieved don't close it, and if firmwareFileSize is negative fail. CID 3493 CID CID 3494.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39976 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Fredrik Holmqvist
2010-12-28 12:34:16 +00:00
parent ec349ca3bb
commit 2a74e90028
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/compat/freebsd_network/firmware.c
+5 -2
View File
@@ -47,7 +47,7 @@ const struct firmware*
firmware_get(const char* fbsdFirmwareName) firmware_get(const char* fbsdFirmwareName)
{ {
char* fbsdFirmwareNameCopy = NULL; char* fbsdFirmwareNameCopy = NULL;
int fileDescriptor = 0; int fileDescriptor = -1;
struct firmware* firmware = NULL; struct firmware* firmware = NULL;
int32 firmwareFileSize; int32 firmwareFileSize;
char* firmwarePath = NULL; char* firmwarePath = NULL;
@@ -75,6 +75,9 @@ firmware_get(const char* fbsdFirmwareName)
goto cleanup; goto cleanup;
firmwareFileSize = lseek(fileDescriptor, 0, SEEK_END); firmwareFileSize = lseek(fileDescriptor, 0, SEEK_END);
if (firmwareFileSize == -1)
goto cleanup;
lseek(fileDescriptor, 0, SEEK_SET); lseek(fileDescriptor, 0, SEEK_SET);
fbsdFirmwareNameCopy = strndup(fbsdFirmwareName, fbsdFirmwareNameCopy = strndup(fbsdFirmwareName,
@@ -111,7 +114,7 @@ cleanup:
free(fbsdFirmwareNameCopy); free(fbsdFirmwareNameCopy);
if (firmwarePath) if (firmwarePath)
free(firmwarePath); free(firmwarePath);
if (fileDescriptor) if (fileDescriptor >= 0)
close(fileDescriptor); close(fileDescriptor);
return NULL; return NULL;
} }