summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author dankan1890 <mewuidev2@gmail.com>2016-04-15 17:20:50 +0200
committer dankan1890 <mewuidev2@gmail.com>2016-04-15 17:20:50 +0200
commit295c7294d3dbccdd620529286c36423a390cca73 (patch)
treebd0e8a581be00603d2e66de97972d684e95f7cf3
parent570c743fcd610aa824c91ed0003ffe737477c6f6 (diff)
cdrom: declared (std::nothrow) some allocations. (nw)
-rw-r--r--src/lib/util/cdrom.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/util/cdrom.cpp b/src/lib/util/cdrom.cpp
index da3d921ae4a..74cc984a257 100644
--- a/src/lib/util/cdrom.cpp
+++ b/src/lib/util/cdrom.cpp
@@ -224,7 +224,7 @@ cdrom_file *cdrom_open(const char *inputfile)
UINT32 physofs, logofs;
/* allocate memory for the CD-ROM file */
- file = new cdrom_file();
+ file = new (std::nothrow) cdrom_file();
if (file == nullptr)
return nullptr;
@@ -331,7 +331,7 @@ cdrom_file *cdrom_open(chd_file *chd)
return nullptr;
/* allocate memory for the CD-ROM file */
- file = new cdrom_file();
+ file = new (std::nothrow) cdrom_file();
if (file == nullptr)
return nullptr;
@@ -1222,7 +1222,7 @@ chd_error cdrom_parse_metadata(chd_file *chd, cdrom_toc *toc)
if (toc->numtrks > 0)
return CHDERR_NONE;
- printf("toc->numtrks = %d?!\n", toc->numtrks);
+ printf("toc->numtrks = %u?!\n", toc->numtrks);
/* look for old-style metadata */
dynamic_buffer oldmetadata;