瀏覽代碼

[xen] Use standard calling pattern for asprintf()

Our asprintf() implementation guarantees that strp will be NULL on
allocation failure, but this is not standard behaviour.  Detect errors
by checking for a negative return value instead of a NULL pointer.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 7 年之前
父節點
當前提交
01496a5028
共有 1 個文件被更改,包括 1 次插入2 次删除
  1. 1
    2
      src/interface/xen/xenstore.c

+ 1
- 2
src/interface/xen/xenstore.c 查看文件

@@ -538,8 +538,7 @@ void xenstore_dump ( struct xen_hypervisor *xen, const char *key ) {
538 538
 		      child += ( strlen ( child ) + 1 /* NUL */ ) ) {
539 539
 
540 540
 			/* Construct child key */
541
-			asprintf ( &child_key, "%s/%s", key, child );
542
-			if ( ! child_key ) {
541
+			if ( asprintf ( &child_key, "%s/%s", key, child ) < 0 ){
543 542
 				DBGC ( xen, "XENSTORE could not allocate child "
544 543
 				       "key \"%s/%s\"\n", key, child );
545 544
 				rc = -ENOMEM;

Loading…
取消
儲存