Several fixes to dumper. CID:107,108,206

	NEGATIVE_RETURNS, REVERSE_INULL

	* src/dumper.c: Make pdump_length an off_t to fix CID:108
	* src/dumper.c (pdump_register_sub): move strlen inside the if to only do it when str!=NULL CID:206
	* src/dumper.c (pdump): Make sure the fds are >=0 and abort otherwise due to the early nature of the call.

Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>

diff --git a/src/dumper.c b/src/dumper.c
index 6ad00e8..d035d7b 100644 (file)
--- a/src/dumper.c
+++ b/src/dumper.c
@@ -194,7 +194,7 @@ typedef struct {
 
 char *pdump_start;
 char *pdump_end;
-static size_t pdump_length;
+static off_t pdump_length;
 
 
 static void (*pdump_free) (void);
@@ -459,8 +459,8 @@ restart:
                }
                case XD_C_STRING: {
                        const char *str = *(const char *const*)rdata;
-                       size_t str_sz = strlen(str);
                        if (str) {
+                               size_t str_sz = strlen(str);
                                pdump_add_entry(&pdump_opaque_data_list,
                                                str, str_sz + 1, 1);
                        }
@@ -1069,7 +1069,16 @@ pdump(const char *dumpfile)
 #undef open
        pdump_fd = open(dumpfile,
                        O_WRONLY | O_CREAT | O_TRUNC | OPEN_BINARY, 0666);
+       if ( pdump_fd < 0 ) {
+               stderr_out("Could not open dump file:");
+               stderr_out(dumpfile);
+               abort();
+       }
        pdump_out = fdopen(pdump_fd, "w");
+       if ( pdump_out < 0 ) {
+               stderr_out("Could not fdopen dump file");
+               abort();
+       }
 
        fwrite(&header, sizeof(header), 1, pdump_out);
        PDUMP_ALIGN_OUTPUT(max_align_t);
@@ -1361,7 +1370,8 @@ int pdump_load(const char *argv0)
                /* invocation-name includes a directory component -- presumably it
                   is relative to cwd, not $PATH */
                 assert(strlen(dir) < sizeof(exe_path));
-                strcpy(exe_path, dir);
+                strncpy(exe_path, dir, sizeof(exe_path)-1);
+               exe_path[sizeof(exe_path)-1]='\0';
        } else {
                const char *path = getenv("PATH");
                const char *name = p;