ado/ssp
1
1
Fork 0
mirror of https://github.com/red0124/ssp.git synced 2025-12-14 21:59:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add strict_realloc

Browse Source
This commit is contained in:
ado
2024-02-25 10:42:11 +01:00
parent 110ee840cc
commit f2ff40a625
3 changed files with 31 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/ss/common.hpp
View File

@@ -28,6 +28,15 @@ inline void assert_throw_on_error_not_defined() {
"'throw_on_error' is enabled");
}
inline void* strict_realloc(void* ptr, size_t size) {
ptr = realloc(ptr, size);
if (!ptr) {
throw std::bad_alloc{};
}
return ptr;
}
#if __unix__
inline ssize_t get_line_file(char** lineptr, size_t* n, FILE* stream) {
return getline(lineptr, n, stream);
@@ -46,13 +55,7 @@ ssize_t get_line_file(char** lineptr, size_t* n, FILE* fp) {
if (*lineptr == nullptr || *n < sizeof(buff)) {
size_t new_n = sizeof(buff);
auto new_lineptr = static_cast<char*>(realloc(*lineptr, new_n));
if (new_lineptr == nullptr) {
errno = ENOMEM;
return -1;
}
*lineptr = new_lineptr;
lineptr = static_cast<char*>(strict_realloc(*lineptr, new_n));
*n = new_n;
}
@@ -66,13 +69,7 @@ ssize_t get_line_file(char** lineptr, size_t* n, FILE* fp) {
if (*n <= buff_used + line_used) {
size_t new_n = *n * 2;
auto new_lineptr = static_cast<char*>(realloc(*lineptr, new_n));
if (new_lineptr == nullptr) {
errno = ENOMEM;
return -1;
}
*lineptr = new_lineptr;
lineptr = static_cast<char*>(realloc(*lineptr, new_n));
*n = new_n;
}