From: ceriel <none@none>
Date: Tue, 19 Feb 1991 12:13:08 +0000 (+0000)
Subject: prevent sign-extension in unpack when needed
X-Git-Tag: release-5-5~1250
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=d16c25fc80fc71605d0296671bf41f2245c930fd;p=ack.git

prevent sign-extension in unpack when needed
---

diff --git a/lang/pc/libpc/pac.c b/lang/pc/libpc/pac.c
index c40e6febe..6ce3751ff 100644
--- a/lang/pc/libpc/pac.c
+++ b/lang/pc/libpc/pac.c
@@ -47,6 +47,14 @@ _pac(ad,zd,zp,i,ap) int i; struct descr *ad,*zd; char *zp,*ap; {
 		assert(ad->size == EM_WSIZE);
 		while (--i >= 0)
 			*zp++ = *aptmp++;
+#if EM_WSIZE > 2
+	} else if (zd->size == 2) {
+		int *aptmp = (int *)ap;
+		short *zptmp = (short *) zp;
+		assert(ad->size == EM_WSIZE);
+		while (--i >= 0)
+			*zptmp++ = *aptmp++;
+#endif
 	} else {
 		assert(ad->size == zd->size);
 		while (--i >= 0)
diff --git a/lang/pc/libpc/unp.c b/lang/pc/libpc/unp.c
index d1c35ca86..d9d5a5fa8 100644
--- a/lang/pc/libpc/unp.c
+++ b/lang/pc/libpc/unp.c
@@ -34,7 +34,7 @@ struct descr {
 	int	size;
 };
 
-_unp(ad,zd,i,ap,zp) int i; struct descr *ad,*zd; char *ap,*zp; {
+_unp(ad,zd,i,ap,zp,noext) int i; struct descr *ad,*zd; char *ap,*zp; int noext; {
 
 	if (zd->diff > ad->diff ||
 			(i -= ad->low) < 0 ||
@@ -46,7 +46,17 @@ _unp(ad,zd,i,ap,zp) int i; struct descr *ad,*zd; char *ap,*zp; {
 		int *aptmp = (int *) ap;
 		assert(ad->size == EM_WSIZE);
 		while (--i >= 0)
-			*aptmp++ = *zp++;
+			if (noext) *aptmp++ = *zp++ & 0377;
+			else *aptmp++ = *zp++;
+#if EM_WSIZE > 2
+	} else if (zd->size == 2) {
+		int *aptmp = (int *) ap;
+		short *zptmp = (short *) zp;
+		assert(ad->size == EM_WSIZE);
+		while (--i >= 0)
+			if (noext) *aptmp++ = *zptmp++ & 0177777;
+			else *aptmp++ = *zptmp++;
+#endif
 	} else {
 		assert(ad->size == zd->size);
 		while (--i >= 0)