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

Fixed CID 1290 and 1291: the temp BString is initialized with a new BString and then immediately replaced. A later null check ensures it is OK to initialize it to NULL.

Browse Source 
Also fixed a GCC warning about comparison between signed and unsigned.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27434 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ryan Leavengood
2008-09-12 06:21:34 +00:00
parent 3d65935d2d
commit 4239ee5d66
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/device/Joystick.cpp
+2 -2
View File
@@ -165,14 +165,14 @@ status_t
BJoystick::GetDeviceName(int32 n, char *name, size_t bufSize) BJoystick::GetDeviceName(int32 n, char *name, size_t bufSize)
{ {
CALLED(); CALLED();
BString *temp = new BString(); BString *temp = NULL;
if (fDevices != NULL && fDevices->CountItems() > n) if (fDevices != NULL && fDevices->CountItems() > n)
temp = static_cast<BString*>(fDevices->ItemAt(n)); temp = static_cast<BString*>(fDevices->ItemAt(n));
else else
return B_BAD_INDEX; return B_BAD_INDEX;
if (temp != NULL && name != NULL) { if (temp != NULL && name != NULL) {
if(temp->Length() > bufSize) if(temp->Length() > (int32)bufSize)
return B_NAME_TOO_LONG; return B_NAME_TOO_LONG;
strncpy(name, temp->String(), bufSize); strncpy(name, temp->String(), bufSize);
name[bufSize - 1] = '\0'; name[bufSize - 1] = '\0';