diff options
| author | David Smith <dsmith@redhat.com> | 2009-05-21 16:57:04 -0500 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2009-05-21 16:57:04 -0500 |
| commit | c8e9eb18d8d13d099a4a177fe53de507c1d9ce8b (patch) | |
| tree | ab2388afb795ed1a7ead2fbbf8b9d1b368a8231f /tapset/conversions.stp | |
| parent | dd9a3bcbef65bde65491d959e9458bc641924811 (diff) | |
| parent | 3863e7999255deeaa7f8f4bba7df893773812537 (diff) | |
| download | systemtap-steved-c8e9eb18d8d13d099a4a177fe53de507c1d9ce8b.tar.gz systemtap-steved-c8e9eb18d8d13d099a4a177fe53de507c1d9ce8b.tar.xz systemtap-steved-c8e9eb18d8d13d099a4a177fe53de507c1d9ce8b.zip | |
Merge commit 'origin/master' into pr7043
Conflicts:
runtime/print.c
runtime/transport/transport.c
runtime/transport/transport_msgs.h
Diffstat (limited to 'tapset/conversions.stp')
| -rw-r--r-- | tapset/conversions.stp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tapset/conversions.stp b/tapset/conversions.stp index 70725e9d..31b16821 100644 --- a/tapset/conversions.stp +++ b/tapset/conversions.stp @@ -120,6 +120,8 @@ function user_string_n2:string (addr:long, n:long, err_msg:string) %{ /* pure */ (char __user *) (uintptr_t) THIS->addr, len) < 0) strlcpy(THIS->__retvalue, THIS->err_msg, MAXSTRINGLEN); + else + THIS->__retvalue[len - 1] = '\0'; %} function user_string_n_warn:string (addr:long, n:long) %{ /* pure */ @@ -137,7 +139,8 @@ function user_string_n_warn:string (addr:long, n:long) %{ /* pure */ (void *) (uintptr_t) THIS->addr); _stp_warn(CONTEXT->error_buffer); strlcpy (THIS->__retvalue, "<unknown>", MAXSTRINGLEN); - } + } else + THIS->__retvalue[len - 1] = '\0'; %} function user_string_n_quoted:string (addr:long, n:long) %{ /* pure */ |