Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Coverity Warning in Embedding. Bug 287861. r=brendan

Browse Source
This commit is contained in:
dougt%meer.net 2005-03-29 21:52:19 +00:00
parent 0138acd94b
commit e292ef6982
2 changed files with 89 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embedding/browser/gtk/src/gtkmozembed2.cpp
View File

@ -285,12 +285,10 @@ static void
gtk_moz_embed_class_init(GtkMozEmbedClass *klass)
{
GtkContainerClass *container_class;
GtkBinClass *bin_class;
GtkWidgetClass *widget_class;
GtkObjectClass *object_class;
container_class = GTK_CONTAINER_CLASS(klass);
bin_class = GTK_BIN_CLASS(klass);
widget_class = GTK_WIDGET_CLASS(klass);
object_class = GTK_OBJECT_CLASS(klass);

177
embedding/components/commandhandler/src/nsCommandGroup.cpp
View File

@ -51,85 +51,85 @@
class nsGroupsEnumerator : public nsISimpleEnumerator
{
public:
nsGroupsEnumerator(nsHashtable& inHashTable);
virtual ~nsGroupsEnumerator();
nsGroupsEnumerator(nsHashtable& inHashTable);
virtual ~nsGroupsEnumerator();
NS_DECL_ISUPPORTS
NS_DECL_NSISIMPLEENUMERATOR
protected:
static PRBool PR_CALLBACK HashEnum(nsHashKey *aKey, void *aData, void* aClosure);
static PRBool PR_CALLBACK HashEnum(nsHashKey *aKey, void *aData, void* aClosure);
nsresult Initialize();
nsresult Initialize();
protected:
nsHashtable& mHashTable;
PRInt32 mIndex;
char ** mGroupNames; // array of pointers to PRUnichar* in the hash table
PRBool mInitted;
nsHashtable& mHashTable;
PRInt32 mIndex;
char ** mGroupNames; // array of pointers to PRUnichar* in the hash table
PRBool mInitted;
};
/* Implementation file */
NS_IMPL_ISUPPORTS1(nsGroupsEnumerator, nsISimpleEnumerator)
nsGroupsEnumerator::nsGroupsEnumerator(nsHashtable& inHashTable)
: mHashTable(inHashTable)
, mIndex(-1)
, mGroupNames(nsnull)
, mInitted(PR_FALSE)
: mHashTable(inHashTable)
, mIndex(-1)
, mGroupNames(nsnull)
, mInitted(PR_FALSE)
{
/* member initializers and constructor code */
}
nsGroupsEnumerator::~nsGroupsEnumerator()
{
delete [] mGroupNames; // ok on null pointer
delete [] mGroupNames; // ok on null pointer
}
/* boolean hasMoreElements (); */
NS_IMETHODIMP
nsGroupsEnumerator::HasMoreElements(PRBool *_retval)
{
nsresult rv = NS_OK;
NS_ENSURE_ARG_POINTER(_retval);
nsresult rv = NS_OK;
NS_ENSURE_ARG_POINTER(_retval);
if (!mInitted) {
rv = Initialize();
if (NS_FAILED(rv)) return rv;
}
*_retval = (mIndex < mHashTable.Count() - 1);
return NS_OK;
if (!mInitted) {
rv = Initialize();
if (NS_FAILED(rv)) return rv;
}
*_retval = (mIndex < mHashTable.Count() - 1);
return NS_OK;
}
/* nsISupports getNext (); */
NS_IMETHODIMP
nsGroupsEnumerator::GetNext(nsISupports **_retval)
{
nsresult rv = NS_OK;
NS_ENSURE_ARG_POINTER(_retval);
nsresult rv = NS_OK;
NS_ENSURE_ARG_POINTER(_retval);
if (!mInitted) {
rv = Initialize();
if (NS_FAILED(rv)) return rv;
}
mIndex ++;
if (mIndex >= mHashTable.Count())
return NS_ERROR_FAILURE;
if (!mInitted) {
rv = Initialize();
if (NS_FAILED(rv)) return rv;
}
mIndex ++;
if (mIndex >= mHashTable.Count())
return NS_ERROR_FAILURE;
char *thisGroupName = mGroupNames[mIndex];
nsCOMPtr<nsISupportsCString> supportsString = do_CreateInstance(NS_SUPPORTS_CSTRING_CONTRACTID, &rv);
if (NS_FAILED(rv)) return rv;
char *thisGroupName = mGroupNames[mIndex];
nsCOMPtr<nsISupportsCString> supportsString = do_CreateInstance(NS_SUPPORTS_CSTRING_CONTRACTID, &rv);
if (NS_FAILED(rv)) return rv;
supportsString->SetData(nsDependentCString(thisGroupName));
return CallQueryInterface(supportsString, _retval);
supportsString->SetData(nsDependentCString(thisGroupName));
return CallQueryInterface(supportsString, _retval);
}
/* static */
@ -137,28 +137,28 @@ nsGroupsEnumerator::GetNext(nsISupports **_retval)
PRBool
nsGroupsEnumerator::HashEnum(nsHashKey *aKey, void *aData, void* aClosure)
{
nsGroupsEnumerator* groupsEnum = NS_REINTERPRET_CAST(nsGroupsEnumerator *, aClosure);
nsCStringKey* stringKey = NS_STATIC_CAST(nsCStringKey*, aKey);
groupsEnum->mGroupNames[groupsEnum->mIndex] = (char*)stringKey->GetString();
groupsEnum->mIndex ++;
return PR_TRUE;
nsGroupsEnumerator* groupsEnum = NS_REINTERPRET_CAST(nsGroupsEnumerator *, aClosure);
nsCStringKey* stringKey = NS_STATIC_CAST(nsCStringKey*, aKey);
groupsEnum->mGroupNames[groupsEnum->mIndex] = (char*)stringKey->GetString();
groupsEnum->mIndex ++;
return PR_TRUE;
}
nsresult
nsGroupsEnumerator::Initialize()
{
if (mInitted) return NS_OK;
mGroupNames = new char*[mHashTable.Count()];
if (!mGroupNames) return NS_ERROR_OUT_OF_MEMORY;
mIndex = 0;
mHashTable.Enumerate(HashEnum, (void*)this);
if (mInitted) return NS_OK;
mGroupNames = new char*[mHashTable.Count()];
if (!mGroupNames) return NS_ERROR_OUT_OF_MEMORY;
mIndex = 0;
mHashTable.Enumerate(HashEnum, (void*)this);
mIndex = -1;
mInitted = PR_TRUE;
return NS_OK;
mIndex = -1;
mInitted = PR_TRUE;
return NS_OK;
}
#if 0
@ -168,22 +168,22 @@ nsGroupsEnumerator::Initialize()
class nsNamedGroupEnumerator : public nsISimpleEnumerator
{
public:
nsNamedGroupEnumerator(nsVoidArray* inArray);
virtual ~nsNamedGroupEnumerator();
nsNamedGroupEnumerator(nsVoidArray* inArray);
virtual ~nsNamedGroupEnumerator();
NS_DECL_ISUPPORTS
NS_DECL_NSISIMPLEENUMERATOR
protected:
nsVoidArray* mGroupArray;
PRInt32 mIndex;
nsVoidArray* mGroupArray;
PRInt32 mIndex;
};
nsNamedGroupEnumerator::nsNamedGroupEnumerator(nsVoidArray* inArray)
: mGroupArray(inArray)
, mIndex(-1)
: mGroupArray(inArray)
, mIndex(-1)
{
}
@ -197,34 +197,35 @@ NS_IMPL_ISUPPORTS1(nsNamedGroupEnumerator, nsISimpleEnumerator)
NS_IMETHODIMP
nsNamedGroupEnumerator::HasMoreElements(PRBool *_retval)
{
NS_ENSURE_ARG_POINTER(_retval);
PRInt32 arrayLen = mGroupArray ? mGroupArray->Count() : 0;
*_retval = (mIndex < arrayLen - 1);
return NS_OK;
NS_ENSURE_ARG_POINTER(_retval);
PRInt32 arrayLen = mGroupArray ? mGroupArray->Count() : 0;
*_retval = (mIndex < arrayLen - 1);
return NS_OK;
}
/* nsISupports getNext (); */
NS_IMETHODIMP
nsNamedGroupEnumerator::GetNext(nsISupports **_retval)
{
NS_ENSURE_ARG_POINTER(_retval);
NS_ENSURE_ARG_POINTER(_retval);
if (!mGroupArray)
return NS_ERROR_FAILURE;
if (!mGroupArray)
return NS_ERROR_FAILURE;
mIndex ++;
if (mIndex >= mGroupArray->Count())
return NS_ERROR_FAILURE;
PRUnichar *thisGroupName = (PRUnichar *)mGroupArray->ElementAt(mIndex);
nsresult rv;
nsCOMPtr<nsISupportsString> supportsString = do_CreateInstance(NS_SUPPORTS_STRING_CONTRACTID, &rv);
if (NS_FAILED(rv)) return rv;
mIndex ++;
if (mIndex >= mGroupArray->Count())
return NS_ERROR_FAILURE;
PRUnichar *thisGroupName = (PRUnichar *)mGroupArray->ElementAt(mIndex);
NS_ASSERTION(thisGroupName, "Bad Element in mGroupArray");
nsresult rv;
nsCOMPtr<nsISupportsString> supportsString = do_CreateInstance(NS_SUPPORTS_STRING_CONTRACTID, &rv);
if (NS_FAILED(rv)) return rv;
supportsString->SetData(nsDependentString(thisGroupName));
return CallQueryInterface(supportsString, _retval);
supportsString->SetData(nsDependentString(thisGroupName));
return CallQueryInterface(supportsString, _retval);
}
#if 0
@ -327,8 +328,8 @@ nsControllerCommandGroup::IsCommandInGroup(const char * aCommand, const char * a
NS_IMETHODIMP
nsControllerCommandGroup::GetGroupsEnumerator(nsISimpleEnumerator **_retval)
{
nsGroupsEnumerator* groupsEnum = new nsGroupsEnumerator(mGroupsHash);
if (!groupsEnum) return NS_ERROR_OUT_OF_MEMORY;
nsGroupsEnumerator* groupsEnum = new nsGroupsEnumerator(mGroupsHash);
if (!groupsEnum) return NS_ERROR_OUT_OF_MEMORY;
return groupsEnum->QueryInterface(NS_GET_IID(nsISimpleEnumerator), (void **)_retval);
}
@ -338,10 +339,10 @@ NS_IMETHODIMP
nsControllerCommandGroup::GetEnumeratorForGroup(const char * aGroup, nsISimpleEnumerator **_retval)
{
nsCStringKey groupKey(aGroup);
nsVoidArray* commandList = (nsVoidArray *)mGroupsHash.Get(&groupKey); // may be null
nsVoidArray* commandList = (nsVoidArray *)mGroupsHash.Get(&groupKey); // may be null
nsNamedGroupEnumerator* theGroupEnum = new nsNamedGroupEnumerator(commandList);
if (!theGroupEnum) return NS_ERROR_OUT_OF_MEMORY;
nsNamedGroupEnumerator* theGroupEnum = new nsNamedGroupEnumerator(commandList);
if (!theGroupEnum) return NS_ERROR_OUT_OF_MEMORY;
return theGroupEnum->QueryInterface(NS_GET_IID(nsISimpleEnumerator), (void **)_retval);
}