Changeset 3840 in MondoRescue for branches

Timestamp:

Mar 6, 2024, 1:20:15 AM (14 months ago)

Author:

Bruno Cornec

Message:

Fix a static memory allocation in fifo mngt

Location:

branches/3.3/mondo/src/common

Files:

• Makefile.am (modified) (1 diff)
• libmondo-fifo.c (modified) (6 diffs)
• libmondo-fifo.h (deleted)

branches/3.3/mondo/src/common/Makefile.am

@@ -17 +17 @@
                        libmondo-gui.h libmondo-raid.h \
                        libmondo-stream.h libmondo-string.h libmondo-tools.h \
-                       libmondo-verify.h libmondo-fifo.h libmondo-cli.h \
+                       libmondo-verify.h libmondo-cli.h \
                        libmondo-archive-EXT.h my-stuff.h mondostructures.h \
                        libmondo-devices-EXT.h libmondo-fifo-EXT.h \

branches/3.3/mondo/src/common/libmondo-fifo.c

@@ -40 +40 @@
 
 
-
 /**
  * Command line with which @c buffer was invoked.
  */
-char g_sz_call_to_buffer[MAX_STR_LEN];
+char *g_call_to_buffer = NULL;
 
 /**
@@ -107 +106 @@
     }
     if (bufsize) {
-        sprintf(g_sz_call_to_buffer,
+        mr_asprintf(g_call_to_buffer,
                 "buffer -m %d%c -p%d -B -s%ld -%c %s 2>> %s", bufsize, 'm',
                 (direction == 'r') ? 20 : 75, internal_tape_block_size,
                 keych, device, MONDO_LOGFILE);
     } else {
-        sprintf(g_sz_call_to_buffer, "dd bs=%ld %cf=%s",
+        mr_asprintf(g_call_to_buffer, "dd bs=%ld %cf=%s",
                 internal_tape_block_size, keych, device);
     }
-    log_msg(2, "Calling buffer --- command = '%s'", g_sz_call_to_buffer);
+    log_msg(2, "Calling buffer --- command = '%s'", g_call_to_buffer);
     mr_asprintf(sz_dir, "%c", direction);
-    fres = popen(g_sz_call_to_buffer, sz_dir);
+    fres = popen(g_call_to_buffer, sz_dir);
     mr_free(sz_dir);
 
@@ -128 +127 @@
     }
     sleep(2);
-    mr_asprintf(tmp, "ps %s | grep \"%s\"", ps_options, g_sz_call_to_buffer);
+    mr_asprintf(tmp, "ps %s | grep \"%s\"", ps_options, g_call_to_buffer);
     if (run_program_and_log_output(tmp, 2)) {
         log_msg(2, "Warning - I think I failed to open tape, actually.");
@@ -149 +148 @@
 /**
  * Kill @c buffer processes.
- * Only called in mondoarchive
+ * Only called in mondoarchive at then before exiting thus freeing memory
  */
 void kill_buffer()
@@ -156 +155 @@
     char *command = NULL;
 
-    if (g_sz_call_to_buffer == NULL) {
+    if (g_call_to_buffer == NULL) {
         return;
     }
-    if (strcmp(g_sz_call_to_buffer,"") == 0) {
+    if (strcmp(g_call_to_buffer,"") == 0) {
         return;
     }
     sync();
-    mr_asprintf(command, "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options, g_sz_call_to_buffer);
+    mr_asprintf(command, "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options, g_call_to_buffer);
     log_msg(2, "kill_buffer() --- command = %s", command);
     tmp = call_program_and_get_last_line_of_output(command);
@@ -175 +174 @@
     mr_free(tmp);
     mr_free(command);
+    mr_free(g_call_to_buffer);
 }