* [Qemu-trivial] [PATCH] cutils: refine strtol error handling in parse_debug_env
@ 2015-02-11 11:30 ` Paolo Bonzini
0 siblings, 0 replies; 6+ messages in thread
From: Paolo Bonzini @ 2015-02-11 11:30 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial
Avoid truncation of a 64-bit long to a 32-bit int, and check for errno
(especially ERANGE).
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
v1->v2: clear errno before strtol
---
util/cutils.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/util/cutils.c b/util/cutils.c
index dbe7412..9312e45 100644
--- a/util/cutils.c
+++ b/util/cutils.c
@@ -523,16 +523,17 @@ int parse_debug_env(const char *name, int max, int initial)
{
char *debug_env = getenv(name);
char *inv = NULL;
- int debug;
+ long debug;
if (!debug_env) {
return initial;
}
+ errno = 0;
debug = strtol(debug_env, &inv, 10);
if (inv == debug_env) {
return initial;
}
- if (debug < 0 || debug > max) {
+ if (debug < 0 || debug > max || errno != 0) {
fprintf(stderr, "warning: %s not in [0, %d]", name, max);
return initial;
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Qemu-devel] [PATCH] cutils: refine strtol error handling in parse_debug_env
@ 2015-02-11 11:30 ` Paolo Bonzini
0 siblings, 0 replies; 6+ messages in thread
From: Paolo Bonzini @ 2015-02-11 11:30 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial
Avoid truncation of a 64-bit long to a 32-bit int, and check for errno
(especially ERANGE).
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
v1->v2: clear errno before strtol
---
util/cutils.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/util/cutils.c b/util/cutils.c
index dbe7412..9312e45 100644
--- a/util/cutils.c
+++ b/util/cutils.c
@@ -523,16 +523,17 @@ int parse_debug_env(const char *name, int max, int initial)
{
char *debug_env = getenv(name);
char *inv = NULL;
- int debug;
+ long debug;
if (!debug_env) {
return initial;
}
+ errno = 0;
debug = strtol(debug_env, &inv, 10);
if (inv == debug_env) {
return initial;
}
- if (debug < 0 || debug > max) {
+ if (debug < 0 || debug > max || errno != 0) {
fprintf(stderr, "warning: %s not in [0, %d]", name, max);
return initial;
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Qemu-trivial] [Qemu-devel] [PATCH] cutils: refine strtol error handling in parse_debug_env
2015-02-11 11:30 ` [Qemu-devel] " Paolo Bonzini
@ 2015-02-11 13:42 ` Eric Blake
-1 siblings, 0 replies; 6+ messages in thread
From: Eric Blake @ 2015-02-11 13:42 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: qemu-trivial
[-- Attachment #1: Type: text/plain, Size: 492 bytes --]
On 02/11/2015 04:30 AM, Paolo Bonzini wrote:
> Avoid truncation of a 64-bit long to a 32-bit int, and check for errno
> (especially ERANGE).
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> v1->v2: clear errno before strtol
> ---
> util/cutils.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-trivial] [PATCH] cutils: refine strtol error handling in parse_debug_env
2015-02-11 11:30 ` [Qemu-devel] " Paolo Bonzini
@ 2015-02-16 8:28 ` Michael Tokarev
-1 siblings, 0 replies; 6+ messages in thread
From: Michael Tokarev @ 2015-02-16 8:28 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: qemu-trivial
Applied to -trivial, thanks!
/mjt
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-02-16 8:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-11 11:30 [Qemu-trivial] [PATCH] cutils: refine strtol error handling in parse_debug_env Paolo Bonzini
2015-02-11 11:30 ` [Qemu-devel] " Paolo Bonzini
2015-02-11 13:42 ` [Qemu-trivial] " Eric Blake
2015-02-11 13:42 ` Eric Blake
2015-02-16 8:28 ` [Qemu-trivial] " Michael Tokarev
2015-02-16 8:28 ` [Qemu-devel] " Michael Tokarev
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.