oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/HugeAllocator: throw std::bad_alloc on error

Browse Source
This commit is contained in:
Max Kellermann
2016-06-17 17:44:45 +02:00
parent 35faafb32c
commit ef053035d0
7 changed files with 39 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/input/plugins/NfsInputPlugin.cxx
View File

@@ -48,11 +48,10 @@ class NfsInputStream final : public AsyncInputStream, NfsFileReader {
bool reconnect_on_resume, reconnecting;
public:
NfsInputStream(const char *_uri,
Mutex &_mutex, Cond &_cond,
void *_buffer)
NfsInputStream(const char *_uri, Mutex &_mutex, Cond &_cond)
:AsyncInputStream(_uri, _mutex, _cond,
_buffer, NFS_MAX_BUFFERED,
HugeAllocate(NFS_MAX_BUFFERED),
NFS_MAX_BUFFERED,
NFS_RESUME_AT),
reconnect_on_resume(false), reconnecting(false) {}
@@ -239,13 +238,7 @@ input_nfs_open(const char *uri,
if (!StringStartsWith(uri, "nfs://"))
return nullptr;
void *buffer = HugeAllocate(NFS_MAX_BUFFERED);
if (buffer == nullptr) {
error.Set(nfs_domain, "Out of memory");
return nullptr;
}
NfsInputStream *is = new NfsInputStream(uri, mutex, cond, buffer);
NfsInputStream *is = new NfsInputStream(uri, mutex, cond);
if (!is->Open(error)) {
delete is;
return nullptr;