summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--tapsets.cxx5
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7a8fa788..55452045 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-25 David Smith <dsmith@redhat.com>
+
+ PR 6455.
+ * tapsets.cxx (mark_builder::build): Handles markers with no
+ format string.
+
2008-04-24 Frank Ch. Eigler <fche@elastic.org>
PR 6454.
diff --git a/tapsets.cxx b/tapsets.cxx
index c0a090e2..23e85a0e 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -6488,6 +6488,11 @@ mark_builder::build(systemtap_session & sess,
string::size_type notwhite = format.find_first_not_of(" \t");
format.erase(0, notwhite);
+ // If the format is empty, make sure we add back a space
+ // character, which is what MARK_NOARGS expands to.
+ if (format.length() == 0)
+ format = " ";
+
if (sess.verbose>3)
clog << "'" << name << "' '" << module << "' '" << format
<< "'" << endl;