qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Wei Jiangang <weijg.fnst@cn.fujitsu.com>
Subject: [Qemu-devel] [PULL 10/17] linux-user: complete omission of removing uses of strdup
Date: Thu, 15 Sep 2016 16:21:49 +0200	[thread overview]
Message-ID: <1473949316-31264-11-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1473949316-31264-1-git-send-email-pbonzini@redhat.com>

From: Wei Jiangang <weijg.fnst@cn.fujitsu.com>

The 900cfbc just removed two unchecked uses of strdup
in fill_psinfo and missed the rest in core_dump_filename.
This patch fixes it.

Signed-off-by: Wei Jiangang <weijg.fnst@cn.fujitsu.com>
Message-Id: <1459997185-15669-2-git-send-email-weijg.fnst@cn.fujitsu.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 linux-user/elfload.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index f807baf..29455e4 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -2718,7 +2718,6 @@ static int core_dump_filename(const TaskState *ts, char *buf,
                               size_t bufsize)
 {
     char timestamp[64];
-    char *filename = NULL;
     char *base_filename = NULL;
     struct timeval tv;
     struct tm tm;
@@ -2731,14 +2730,12 @@ static int core_dump_filename(const TaskState *ts, char *buf,
         return (-1);
     }
 
-    filename = strdup(ts->bprm->filename);
-    base_filename = strdup(basename(filename));
+    base_filename = g_path_get_basename(ts->bprm->filename);
     (void) strftime(timestamp, sizeof (timestamp), "%Y%m%d-%H%M%S",
                     localtime_r(&tv.tv_sec, &tm));
     (void) snprintf(buf, bufsize, "qemu_%s_%s_%d.core",
                     base_filename, timestamp, (int)getpid());
-    free(base_filename);
-    free(filename);
+    g_free(base_filename);
 
     return (0);
 }
-- 
1.8.3.1

  parent reply	other threads:[~2016-09-15 14:23 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-15 14:21 [Qemu-devel] [PULL 00/17] Second batch of misc patches for QEMU 2.8 Paolo Bonzini
2016-09-15 14:21 ` [Qemu-devel] [PULL 01/17] scsi-disk: Cleaning up around tray open state Paolo Bonzini
2016-09-15 14:21 ` [Qemu-devel] [PULL 02/17] virtio-scsi: Don't abort when media is ejected Paolo Bonzini
2016-09-15 14:21 ` [Qemu-devel] [PULL 03/17] scsi: mptsas: use g_new0 to allocate MPTSASRequest object Paolo Bonzini
2016-09-15 14:21 ` [Qemu-devel] [PULL 04/17] cutils: Rewrite x86 buffer zero checking Paolo Bonzini
2016-09-15 14:21 ` [Qemu-devel] [PULL 05/17] Change net/socket.c to use socket_*() functions Paolo Bonzini
2016-09-15 14:21 ` [Qemu-devel] [PULL 06/17] memory: remove memory_region_destructor_rom_device Paolo Bonzini
2016-09-15 14:21 ` [Qemu-devel] [PULL 07/17] scsi: pvscsi: limit process IO loop to ring size Paolo Bonzini
2016-09-15 14:21 ` [Qemu-devel] [PULL 08/17] pc: apic: fix touch LAPIC when irqchip is split Paolo Bonzini
2016-09-15 14:21 ` [Qemu-devel] [PULL 09/17] target-i386: fix ordering of fields in CPUX86State Paolo Bonzini
2016-09-15 14:21 ` Paolo Bonzini [this message]
2016-09-15 14:21 ` [Qemu-devel] [PULL 11/17] build-sys: add make 'help' target Paolo Bonzini
2016-09-15 14:21 ` [Qemu-devel] [PULL 12/17] qemu-char: avoid segfault if user lacks of permisson of a given logfile Paolo Bonzini
2016-09-15 14:21 ` [Qemu-devel] [PULL 13/17] log: fix parsing of multiple trace:PATTERN log args Paolo Bonzini
2016-09-15 14:21 ` [Qemu-devel] [PULL 14/17] target-i386: Fixed syscall posssible segfault Paolo Bonzini
2016-09-15 14:21 ` [Qemu-devel] [PULL 15/17] pc: apic: introduce APIC macro Paolo Bonzini
2016-09-15 14:21 ` [Qemu-devel] [PULL 16/17] kvmvapic: fix state change handler Paolo Bonzini
2016-09-15 14:21 ` [Qemu-devel] [PULL 17/17] pcspk: adding vmstate for save/restore Paolo Bonzini
2016-09-15 15:59 ` [Qemu-devel] [PULL 00/17] Second batch of misc patches for QEMU 2.8 no-reply
2016-09-15 18:12 ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1473949316-31264-11-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=weijg.fnst@cn.fujitsu.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).