mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

r=brendan,a=brendan. 54127. This change cleans up a leak when we run out of memory, and reduces allocation of the file extension buffer by 2x. it also dumps the count to a local variable to do away w/ memory ambiguity using a pointer to elementCount

This commit is contained in:
valeski%netscape.com 2000-09-27 19:50:59 +00:00
Родитель 4a62f9220b
Коммит 8e3f2ce2da
2 изменённых файлов: 22 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
netwerk/mime/src/nsMIMEInfoImpl.cpp
Просмотреть файл

@ -46,18 +46,24 @@ nsMIMEInfoImpl::GetExtCount() {
NS_IMETHODIMP
nsMIMEInfoImpl::GetFileExtensions(PRUint32 *elementCount, char ***extensions) {
*elementCount = mExtensions.Count();
if (*elementCount < 1) return NS_OK;;
PRUint32 count = mExtensions.Count();
if (count < 1) return NS_OK;
char **_retExts = (char**)nsMemory::Alloc((*elementCount)*2*sizeof(char*));
char **_retExts = (char**)nsMemory::Alloc((count)*sizeof(char*));
if (!_retExts) return NS_ERROR_OUT_OF_MEMORY;
for (PRUint8 i=0; i < *elementCount; i++) {
for (PRUint8 i=0; i < count; i++) {
nsCString* ext = mExtensions.CStringAt(i);
_retExts[i] = ext->ToNewCString();
if (!_retExts[i]) return NS_ERROR_OUT_OF_MEMORY;
if (!_retExts[i]) {
// clean up all the strings we've allocated
while (i-- != 0) nsMemory::Free(_retExts[i]);
nsMemory::Free(_retExts);
return NS_ERROR_OUT_OF_MEMORY;
}
}
*elementCount = count;
*extensions = _retExts;
return NS_OK;

16
uriloader/exthandler/nsMIMEInfoImpl.cpp
Просмотреть файл

@ -46,18 +46,24 @@ nsMIMEInfoImpl::GetExtCount() {
NS_IMETHODIMP
nsMIMEInfoImpl::GetFileExtensions(PRUint32 *elementCount, char ***extensions) {
*elementCount = mExtensions.Count();
if (*elementCount < 1) return NS_OK;;
PRUint32 count = mExtensions.Count();
if (count < 1) return NS_OK;
char **_retExts = (char**)nsMemory::Alloc((*elementCount)*2*sizeof(char*));
char **_retExts = (char**)nsMemory::Alloc((count)*sizeof(char*));
if (!_retExts) return NS_ERROR_OUT_OF_MEMORY;
for (PRUint8 i=0; i < *elementCount; i++) {
for (PRUint8 i=0; i < count; i++) {
nsCString* ext = mExtensions.CStringAt(i);
_retExts[i] = ext->ToNewCString();
if (!_retExts[i]) return NS_ERROR_OUT_OF_MEMORY;
if (!_retExts[i]) {
// clean up all the strings we've allocated
while (i-- != 0) nsMemory::Free(_retExts[i]);
nsMemory::Free(_retExts);
return NS_ERROR_OUT_OF_MEMORY;
}
}
*elementCount = count;
*extensions = _retExts;
return NS_OK;