Fix trivial unchecked allocations

Samuel Arnold · Samuel Arnold · commit c7ac6273246e · 2026-01-05T13:44:20.000-08:00
diff --git a/arch/AArch64/AArch64Module.c b/arch/AArch64/AArch64Module.c
@@ -13,6 +13,8 @@ cs_err AArch64_global_init(cs_struct *ud)
 {
 	MCRegisterInfo *mri;
 	mri = cs_mem_malloc(sizeof(*mri));
+	if (!mri)
+		return CS_ERR_MEM;
 
 	AArch64_init_mri(mri);
 	ud->printer = AArch64_printer;
diff --git a/arch/ARC/ARCModule.c b/arch/ARC/ARCModule.c
@@ -14,6 +14,8 @@ cs_err ARC_global_init(cs_struct *ud)
 {
 	MCRegisterInfo *mri;
 	mri = cs_mem_malloc(sizeof(*mri));
+	if (!mri)
+		return CS_ERR_MEM;
 
 	ARC_init_mri(mri);
 
@@ -49,4 +51,4 @@ cs_err ARC_option(cs_struct *handle, cs_opt_type type, size_t value)
 	return CS_ERR_OK;
 }
 
-#endif
+#endif
diff --git a/arch/ARM/ARMModule.c b/arch/ARM/ARMModule.c
@@ -14,6 +14,8 @@ cs_err ARM_global_init(cs_struct *ud)
 {
 	MCRegisterInfo *mri;
 	mri = cs_mem_malloc(sizeof(*mri));
+	if (!mri)
+		return CS_ERR_MEM;
 
 	ARM_init_mri(mri);
 
diff --git a/arch/Alpha/AlphaModule.c b/arch/Alpha/AlphaModule.c
@@ -14,6 +14,8 @@ cs_err ALPHA_global_init(cs_struct *ud)
 	MCRegisterInfo *mri;
 
 	mri = cs_mem_malloc(sizeof(*mri));
+	if (!mri)
+		return CS_ERR_MEM;
 
 	Alpha_init(mri);
 	ud->printer = Alpha_printInst;
diff --git a/arch/LoongArch/LoongArchModule.c b/arch/LoongArch/LoongArchModule.c
@@ -15,6 +15,8 @@ cs_err LoongArch_global_init(cs_struct *ud)
 {
 	MCRegisterInfo *mri;
 	mri = cs_mem_malloc(sizeof(*mri));
+	if (!mri)
+		return CS_ERR_MEM;
 
 	LoongArch_init_mri(mri);
 
diff --git a/arch/MOS65XX/MOS65XXModule.c b/arch/MOS65XX/MOS65XXModule.c
@@ -14,6 +14,9 @@ cs_err MOS65XX_global_init(cs_struct *ud)
 	mos65xx_info *info;
 
 	info = cs_mem_malloc(sizeof(*info));
+	if (!info)
+		return CS_ERR_MEM;
+
 	info->hex_prefix = NULL;
 	info->cpu_type = MOS65XX_CPU_TYPE_6502;
 	info->long_m = 0;
diff --git a/arch/Mips/MipsModule.c b/arch/Mips/MipsModule.c
@@ -14,6 +14,8 @@ cs_err Mips_global_init(cs_struct *ud)
 {
 	MCRegisterInfo *mri;
 	mri = cs_mem_malloc(sizeof(*mri));
+	if (!mri)
+		return CS_ERR_MEM;
 
 	Mips_init_mri(mri);
 
diff --git a/arch/PowerPC/PPCModule.c b/arch/PowerPC/PPCModule.c
@@ -12,6 +12,8 @@ cs_err PPC_global_init(cs_struct *ud)
 {
 	MCRegisterInfo *mri;
 	mri = (MCRegisterInfo *)cs_mem_malloc(sizeof(*mri));
+	if (!mri)
+		return CS_ERR_MEM;
 
 	PPC_init_mri(mri);
 	ud->printer = PPC_printer;
diff --git a/arch/RISCV/RISCVModule.c b/arch/RISCV/RISCVModule.c
@@ -15,6 +15,8 @@ cs_err RISCV_global_init(cs_struct *ud)
 {
 	MCRegisterInfo *mri;
 	mri = cs_mem_malloc(sizeof(*mri));
+	if (!mri)
+		return CS_ERR_MEM;
 
 	RISCV_init(mri);
 	ud->printer = RISCV_printInst;
diff --git a/arch/Sparc/SparcModule.c b/arch/Sparc/SparcModule.c
@@ -12,6 +12,8 @@ cs_err Sparc_global_init(cs_struct *ud)
 {
 	MCRegisterInfo *mri;
 	mri = cs_mem_malloc(sizeof(*mri));
+	if (!mri)
+		return CS_ERR_MEM;
 
 	Sparc_init_mri(mri);
 	ud->printer = Sparc_printer;
diff --git a/arch/SystemZ/SystemZModule.c b/arch/SystemZ/SystemZModule.c
@@ -12,6 +12,8 @@ cs_err SystemZ_global_init(cs_struct *ud)
 {
 	MCRegisterInfo *mri;
 	mri = cs_mem_malloc(sizeof(*mri));
+	if (!mri)
+		return CS_ERR_MEM;
 
 	SystemZ_init_mri(mri);
 	ud->printer = SystemZ_printer;
diff --git a/arch/TMS320C64x/TMS320C64xModule.c b/arch/TMS320C64x/TMS320C64xModule.c
@@ -15,6 +15,8 @@ cs_err TMS320C64x_global_init(cs_struct *ud)
 	MCRegisterInfo *mri;
 
 	mri = cs_mem_malloc(sizeof(*mri));
+	if (!mri)
+		return CS_ERR_MEM;
 
 	TMS320C64x_init(mri);
 	ud->printer = TMS320C64x_printInst;
diff --git a/arch/TriCore/TriCoreModule.c b/arch/TriCore/TriCoreModule.c
@@ -12,6 +12,9 @@ cs_err TRICORE_global_init(cs_struct *ud)
 {
 	MCRegisterInfo *mri;
 	mri = cs_mem_calloc(sizeof(*mri), 1);
+	if (!mri)
+		return CS_ERR_MEM;
+
 	TriCore_init_mri(mri);
 	ud->printer = TriCore_printInst;
 	ud->printer_info = mri;
diff --git a/arch/X86/X86Module.c b/arch/X86/X86Module.c
@@ -14,6 +14,8 @@ cs_err X86_global_init(cs_struct *ud)
 {
 	MCRegisterInfo *mri;
 	mri = cs_mem_malloc(sizeof(*mri));
+	if (!mri)
+		return CS_ERR_MEM;
 
 	X86_init(mri);
 
diff --git a/arch/XCore/XCoreModule.c b/arch/XCore/XCoreModule.c
@@ -14,6 +14,8 @@ cs_err XCore_global_init(cs_struct *ud)
 {
 	MCRegisterInfo *mri;
 	mri = cs_mem_malloc(sizeof(*mri));
+	if (!mri)
+		return CS_ERR_MEM;
 
 	XCore_init(mri);
 	ud->printer = XCore_printInst;
diff --git a/arch/Xtensa/XtensaModule.c b/arch/Xtensa/XtensaModule.c
@@ -11,6 +11,8 @@ cs_err Xtensa_global_init(cs_struct *ud)
 {
 	MCRegisterInfo *mri;
 	mri = cs_mem_calloc(1, sizeof(*mri));
+	if (!mri)
+		return CS_ERR_MEM;
 
 	Xtensa_init_mri(mri);
 	ud->printer = Xtensa_printer;
@@ -44,4 +46,4 @@ cs_err Xtensa_option(cs_struct *handle, cs_opt_type type, size_t value)
 	}
 
 	return CS_ERR_OK;
-}
+}
diff --git a/cs.c b/cs.c
@@ -1103,6 +1103,10 @@ cs_err CAPSTONE_API cs_option(csh ud, cs_opt_type type, size_t value)
 				// 2. add this instruction if we have not had it yet
 				if (!tmp) {
 					tmp = cs_mem_malloc(sizeof(*tmp));
+					if (!tmp) {
+						return CS_ERR_MEM;
+					}
+
 					tmp->insn.id = opt->id;
 					(void)strncpy(
 						tmp->insn.mnemonic,
@@ -1258,6 +1262,17 @@ size_t CAPSTONE_API cs_disasm(csh ud, const uint8_t *buffer, size_t size,
 			// allocate memory for @detail pointer
 			insn_cache->detail =
 				cs_mem_calloc(1, sizeof(cs_detail));
+			if (!insn_cache->detail) {
+				insn_cache = (cs_insn *)total;
+				for (i = 0; i < c; i++, insn_cache++)
+					cs_mem_free(insn_cache->detail);
+
+				cs_mem_free(total);
+				*insn = NULL;
+
+				handle->errnum = CS_ERR_MEM;
+				return 0;
+			}
 		} else {
 			insn_cache->detail = NULL;
 		}

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ cs_err AArch64_global_init(cs_struct *ud)`
`13`	`13`	`{`
`14`	`14`	`MCRegisterInfo *mri;`
`15`	`15`	`mri = cs_mem_malloc(sizeof(*mri));`
	`16`	`+ if (!mri)`
	`17`	`+ return CS_ERR_MEM;`
`16`	`18`
`17`	`19`	`AArch64_init_mri(mri);`
`18`	`20`	`ud->printer = AArch64_printer;`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ cs_err ARC_global_init(cs_struct *ud)`
`14`	`14`	`{`
`15`	`15`	`MCRegisterInfo *mri;`
`16`	`16`	`mri = cs_mem_malloc(sizeof(*mri));`
	`17`	`+ if (!mri)`
	`18`	`+ return CS_ERR_MEM;`
`17`	`19`
`18`	`20`	`ARC_init_mri(mri);`
`19`	`21`
`@@ -49,4 +51,4 @@ cs_err ARC_option(cs_struct *handle, cs_opt_type type, size_t value)`
`49`	`51`	`return CS_ERR_OK;`
`50`	`52`	`}`
`51`	`53`
`52`		`-#endif`
	`54`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ cs_err ARM_global_init(cs_struct *ud)`
`14`	`14`	`{`
`15`	`15`	`MCRegisterInfo *mri;`
`16`	`16`	`mri = cs_mem_malloc(sizeof(*mri));`
	`17`	`+ if (!mri)`
	`18`	`+ return CS_ERR_MEM;`
`17`	`19`
`18`	`20`	`ARM_init_mri(mri);`
`19`	`21`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ cs_err LoongArch_global_init(cs_struct *ud)`
`15`	`15`	`{`
`16`	`16`	`MCRegisterInfo *mri;`
`17`	`17`	`mri = cs_mem_malloc(sizeof(*mri));`
	`18`	`+ if (!mri)`
	`19`	`+ return CS_ERR_MEM;`
`18`	`20`
`19`	`21`	`LoongArch_init_mri(mri);`
`20`	`22`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ cs_err Mips_global_init(cs_struct *ud)`
`14`	`14`	`{`
`15`	`15`	`MCRegisterInfo *mri;`
`16`	`16`	`mri = cs_mem_malloc(sizeof(*mri));`
	`17`	`+ if (!mri)`
	`18`	`+ return CS_ERR_MEM;`
`17`	`19`
`18`	`20`	`Mips_init_mri(mri);`
`19`	`21`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ cs_err PPC_global_init(cs_struct *ud)`
`12`	`12`	`{`
`13`	`13`	`MCRegisterInfo *mri;`
`14`	`14`	`mri = (MCRegisterInfo )cs_mem_malloc(sizeof(mri));`
	`15`	`+ if (!mri)`
	`16`	`+ return CS_ERR_MEM;`
`15`	`17`
`16`	`18`	`PPC_init_mri(mri);`
`17`	`19`	`ud->printer = PPC_printer;`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ cs_err RISCV_global_init(cs_struct *ud)`
`15`	`15`	`{`
`16`	`16`	`MCRegisterInfo *mri;`
`17`	`17`	`mri = cs_mem_malloc(sizeof(*mri));`
	`18`	`+ if (!mri)`
	`19`	`+ return CS_ERR_MEM;`
`18`	`20`
`19`	`21`	`RISCV_init(mri);`
`20`	`22`	`ud->printer = RISCV_printInst;`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ cs_err Sparc_global_init(cs_struct *ud)`
`12`	`12`	`{`
`13`	`13`	`MCRegisterInfo *mri;`
`14`	`14`	`mri = cs_mem_malloc(sizeof(*mri));`
	`15`	`+ if (!mri)`
	`16`	`+ return CS_ERR_MEM;`
`15`	`17`
`16`	`18`	`Sparc_init_mri(mri);`
`17`	`19`	`ud->printer = Sparc_printer;`