Merge branch 'smartcmd:main' into main

1 files changed, 4 insertions, 4 deletions

diff --git a/Minecraft.Client/PS3/PS3Extras/PS3Strings.cpp b/Minecraft.Client/PS3/PS3Extras/PS3Strings.cpp
index 03d916ab..442aab06 100644
--- a/Minecraft.Client/PS3/PS3Extras/PS3Strings.cpp
+++ b/Minecraft.Client/PS3/PS3Extras/PS3Strings.cpp
@@ -13,18 +13,18 @@ uint8_t *mallocAndCreateUTF8ArrayFromString(int iID)
 	if( (cd = l10n_get_converter( L10N_UTF16, L10N_UTF8 )) == -1 ) 
 	{
 		app.DebugPrintf("l10n_get_converter: no such converter\n");
-		return NULL;
+		return nullptr;
 	}
 
-	l10n_convert_str( cd, wchString, &src_len, NULL, &dst_len );
-	uint8_t *strUtf8=(uint8_t *)malloc(dst_len);
+	l10n_convert_str( cd, wchString, &src_len, nullptr, &dst_len );
+	uint8_t *strUtf8=static_cast<uint8_t *>(malloc(dst_len));
 	memset(strUtf8,0,dst_len);
 
 	result = l10n_convert_str( cd, wchString, &src_len, strUtf8, &dst_len );
 	if( result != ConversionOK ) 
 	{
 		app.DebugPrintf("l10n_convert: conversion error : 0x%x\n", result);
-		return NULL;
+		return nullptr;
 	}
 
 	return strUtf8;