[Scummvm-git-logs] scummvm master -> 038579d0d99d2a4d501cb8d08527900cc9b7905a

[ccawley2011]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
038579d0d9 PLUGINS: Improve warnings when allocation fails


Commit: 038579d0d99d2a4d501cb8d08527900cc9b7905a
    https://github.com/scummvm/scummvm/commit/038579d0d99d2a4d501cb8d08527900cc9b7905a
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2022-06-17T20:38:37+01:00

Commit Message:
PLUGINS: Improve warnings when allocation fails

Changed paths:
    backends/plugins/elf/arm-loader.cpp
    backends/plugins/elf/elf-loader.cpp
    backends/plugins/elf/mips-loader.cpp
    backends/plugins/elf/ppc-loader.cpp


diff --git a/backends/plugins/elf/arm-loader.cpp b/backends/plugins/elf/arm-loader.cpp
index ca04e3ccdd3..64395da4f16 100644
--- a/backends/plugins/elf/arm-loader.cpp
+++ b/backends/plugins/elf/arm-loader.cpp
@@ -32,7 +32,7 @@ bool ARMDLObject::relocate(Elf32_Off offset, Elf32_Word size, byte *relSegment)
 
 	// Allocate memory for relocation table
 	if (!(rel = (Elf32_Rel *)malloc(size))) {
-		warning("elfloader: Out of memory.");
+		warning("elfloader: Could not allocate %d bytes for the relocation table", size);
 		return false;
 	}
 
diff --git a/backends/plugins/elf/elf-loader.cpp b/backends/plugins/elf/elf-loader.cpp
index 1d917a68c0e..cbf67f7e876 100644
--- a/backends/plugins/elf/elf-loader.cpp
+++ b/backends/plugins/elf/elf-loader.cpp
@@ -171,7 +171,7 @@ bool DLObject::loadSegment(Elf32_Phdr *phdr) {
 	_segment = (byte *)allocateMemory(phdr->p_align, phdr->p_memsz);
 
 	if (!_segment) {
-		warning("elfloader: Out of memory.");
+		warning("elfloader: Could not allocate %d bytes for the segment", phdr->p_memsz);
 		return false;
 	}
 
@@ -209,7 +209,7 @@ Elf32_Shdr * DLObject::loadSectionHeaders(Elf32_Ehdr *ehdr) {
 
 	// Allocate memory for section headers
 	if (!(shdr = (Elf32_Shdr *)malloc(ehdr->e_shnum * sizeof(*shdr)))) {
-		warning("elfloader: Out of memory.");
+		warning("elfloader: Could not allocate %ld bytes for the section headers", ehdr->e_shnum * sizeof(*shdr));
 		return 0;
 	}
 
@@ -258,7 +258,7 @@ int DLObject::loadSymbolTable(Elf32_Ehdr *ehdr, Elf32_Shdr *shdr) {
 
 	// Allocate memory for symbol table
 	if (!(_symtab = (Elf32_Sym *)malloc(shdr[_symtab_sect].sh_size))) {
-		warning("elfloader: Out of memory.");
+		warning("elfloader: Could not allocate %d bytes for the symbol table", shdr[_symtab_sect].sh_size);
 		return -1;
 	}
 
@@ -286,7 +286,7 @@ bool DLObject::loadStringTable(Elf32_Shdr *shdr) {
 
 	// Allocate memory for string table
 	if (!(_strtab = (char *)malloc(shdr[string_sect].sh_size))) {
-		warning("elfloader: Out of memory.");
+		warning("elfloader: Could not allocate %d bytes for the string table", shdr[string_sect].sh_size);
 		return false;
 	}
 
diff --git a/backends/plugins/elf/mips-loader.cpp b/backends/plugins/elf/mips-loader.cpp
index 45a0abdecd3..3d207d8d0cc 100644
--- a/backends/plugins/elf/mips-loader.cpp
+++ b/backends/plugins/elf/mips-loader.cpp
@@ -35,7 +35,7 @@ bool MIPSDLObject::relocate(Elf32_Off offset, Elf32_Word size, byte *relSegment)
 
 	// Allocate memory for relocation table
 	if (!(rel = (Elf32_Rel *)malloc(size))) {
-		warning("elfloader: Out of memory.");
+		warning("elfloader: Could not allocate %d bytes for the relocation table", size);
 		return false;
 	}
 
diff --git a/backends/plugins/elf/ppc-loader.cpp b/backends/plugins/elf/ppc-loader.cpp
index 0ee97261f7c..b3a001c9480 100644
--- a/backends/plugins/elf/ppc-loader.cpp
+++ b/backends/plugins/elf/ppc-loader.cpp
@@ -32,7 +32,7 @@ bool PPCDLObject::relocate(Elf32_Off offset, Elf32_Word size, byte *relSegment)
 	Elf32_Rela *rel = NULL;
 
 	if (!(rel = (Elf32_Rela *)malloc(size))) {
-		warning("elfloader: Out of memory.");
+		warning("elfloader: Could not allocate %d bytes for the relocation table", size);
 		return false;
 	}