crazy

Author: radare

libr/esil/esil_ops.c

@@ -1596,18 +1596,19 @@ static bool esil_peek_some(REsil *esil) {
 static bool esil_mem_oreq_n(REsil *esil, int bits) {
 	bool ret = false;
 	ut64 s, d;
-	const char *dst = r_esil_pop (esil); // save the dst-addr
-	const char *src0 = r_esil_pop (esil); // get the src
-	const char *src1 = NULL;
-	if (src0 && r_esil_get_parm (esil, src0, &s)) { 	// get the src
-		r_esil_push (esil, dst);			// push the dst-addr
-		ret = !!esil_peek_n (esil, bits);		// read
-		src1 = r_esil_pop (esil);			// get the old dst-value
-		if (src1 && r_esil_get_parm (esil, src1, &d)) { // get the old dst-value
-			d |= s;					// calculate the new dst-value
-			r_esil_pushnum (esil, d);		// push the new dst-value
-			r_esil_push (esil, dst);		// push the dst-addr
-			ret &= (!!esil_poke_n (esil, bits));	// write
+	const char *dst = r_esil_pop (esil);
+	char dst_buf[R_ESIL_TOKEN_SIZE];
+	const char *src0 = r_esil_pop (esil);
+	if (dst && src0 && r_esil_get_parm (esil, src0, &s)) {
+		r_str_ncpy (dst_buf, dst, sizeof (dst_buf));
+		r_esil_push (esil, dst_buf);
+		ret = !!esil_peek_n (esil, bits);
+		const char *src1 = r_esil_pop (esil);
+		if (src1 && r_esil_get_parm (esil, src1, &d)) {
+			d |= s;
+			r_esil_pushnum (esil, d);
+			r_esil_push (esil, dst_buf);
+			ret &= (!!esil_poke_n (esil, bits));
 		} else {
 			ret = false;
 		}
@@ -1637,16 +1638,17 @@ static bool esil_mem_xoreq_n(REsil *esil, int bits) {
 	bool ret = false;
 	ut64 s, d;
 	const char *dst = r_esil_pop (esil);
+	char dst_buf[R_ESIL_TOKEN_SIZE];
 	const char *src0 = r_esil_pop (esil);
-	const char *src1 = NULL;
-	if (src0 && r_esil_get_parm (esil, src0, &s)) {
-		r_esil_push (esil, dst);
+	if (dst && src0 && r_esil_get_parm (esil, src0, &s)) {
+		r_str_ncpy (dst_buf, dst, sizeof (dst_buf));
+		r_esil_push (esil, dst_buf);
 		ret = !!esil_peek_n (esil, bits);
-		src1 = r_esil_pop (esil);
+		const char *src1 = r_esil_pop (esil);
 		if (src1 && r_esil_get_parm (esil, src1, &d)) {
 			d ^= s;
 			r_esil_pushnum (esil, d);
-			r_esil_push (esil, dst);
+			r_esil_push (esil, dst_buf);
 			ret &= (!!esil_poke_n (esil, bits));
 		} else {
 			ret = false;
@@ -1677,16 +1679,17 @@ static bool esil_mem_andeq_n(REsil *esil, int bits) {
 	bool ret = false;
 	ut64 s, d;
 	const char *dst = r_esil_pop (esil);
+	char dst_buf[R_ESIL_TOKEN_SIZE];
 	const char *src0 = r_esil_pop (esil);
-	const char *src1 = NULL;
-	if (src0 && r_esil_get_parm (esil, src0, &s)) {
-		r_esil_push (esil, dst);
+	if (dst && src0 && r_esil_get_parm (esil, src0, &s)) {
+		r_str_ncpy (dst_buf, dst, sizeof (dst_buf));
+		r_esil_push (esil, dst_buf);
 		ret = (!!esil_peek_n (esil, bits));
-		src1 = r_esil_pop (esil);
+		const char *src1 = r_esil_pop (esil);
 		if (src1 && r_esil_get_parm (esil, src1, &d)) {
 			d &= s;
 			r_esil_pushnum (esil, d);
-			r_esil_push (esil, dst);
+			r_esil_push (esil, dst_buf);
 			ret &= (!!esil_poke_n (esil, bits));
 		} else {
 			ret = false;
@@ -1933,18 +1936,19 @@ static bool esil_mem_inceq_n(REsil *esil, int bits) {
 	bool ret = false;
 	ut64 s;
 	const char *off = r_esil_pop (esil);
-	const char *src = NULL;
+	char off_buf[R_ESIL_TOKEN_SIZE];
 	if (off) {
-		r_esil_push (esil, off);
+		r_str_ncpy (off_buf, off, sizeof (off_buf));
+		r_esil_push (esil, off_buf);
 		ret = !!esil_peek_n (esil, bits);
-		src = r_esil_pop (esil);
+		const char *src = r_esil_pop (esil);
 		if (src && r_esil_get_parm (esil, src, &s)) {
 			esil->old = s;
 			s++;
 			esil->cur = s;
 			esil->lastsz = bits;
 			r_esil_pushnum (esil, s);
-			r_esil_push (esil, off);
+			r_esil_push (esil, off_buf);
 			ret &= (!!esil_poke_n (esil, bits));
 		} else {
 			ret = false;
@@ -1975,15 +1979,16 @@ static bool esil_mem_deceq_n(REsil *esil, int bits) {
 	bool ret = false;
 	ut64 s;
 	const char *off = r_esil_pop (esil);
-	const char *src = NULL;
+	char off_buf[R_ESIL_TOKEN_SIZE];
 	if (off) {
-		r_esil_push (esil, off);
+		r_str_ncpy (off_buf, off, sizeof (off_buf));
+		r_esil_push (esil, off_buf);
 		ret = !!esil_peek_n (esil, bits);
-		src = r_esil_pop (esil);
+		const char *src = r_esil_pop (esil);
 		if (src && r_esil_get_parm (esil, src, &s)) {
 			s--;
 			r_esil_pushnum (esil, s);
-			r_esil_push (esil, off);
+			r_esil_push (esil, off_buf);
 			ret &= (!!esil_poke_n (esil, bits));
 		} else {
 			ret = false;