shithub: scc

Info  •  Files  •  Log  •  Branches

[ld] Don't alloc object before testing

If the object type is wrong then we have to free the object,
so it is better to check the type before allocating th ememory.

--- a/src/cmd/ld/pass1.c

+++ b/src/cmd/ld/pass1.c

@@ -174,18 +174,18 @@

 {

 	Obj *obj;

-	if ((obj = objnew(type)) == NULL) {

-		error("out of memory");

-		return;

-	}

-

 	if (bintype != -1 && bintype != type) {

 		error("not compatible object file");

-		goto delete;

+		return;

 	}

 	bintype = type;

 	binops = obj->ops;

- 

+

+	if ((obj = objnew(type)) == NULL) {

+		error("out of memory");

+		return;

+	}

+

 	if ((*binops->read)(obj, fp) < 0) {

 		error("object file corrupted");

 		goto delete;