mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

JRE-774 Don't paste BOM from clipboard on Mac

Browse Source 
port commit ea9b75b3 from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit c6fed2cf58)

cherry picked from commit a5e25d1ef9
This commit is contained in:
Dmitry Batrak
2018-12-24 17:21:31 +03:00
committed by alexey.ushakov@jetbrains.com
parent 1453b156b5
commit fdf1c06bba
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/java.desktop/macosx/native/libawt_lwawt/awt/CClipboard.m
View File

@@ -24,6 +24,7 @@
*/
#import "CDataTransferer.h"
#include "sun_lwawt_macosx_CDataTransferer.h"
#import "ThreadUtilities.h"
#import "JNIUtilities.h"
#import <Cocoa/Cocoa.h>
@@ -259,13 +260,22 @@ JNI_COCOA_ENTER(env);
}
NSUInteger dataSize = [clipData length];
const void *dataBuffer = [clipData bytes];
if (format == sun_lwawt_macosx_CDataTransferer_CF_STRING && dataSize >= 3) {
const unsigned char *bytesPtr = (const unsigned char *)dataBuffer;
if (bytesPtr[0] == 0xEF && bytesPtr[1] == 0xBB && bytesPtr[2] == 0xBF) {
// strip BOM from string content, like native applications do
dataSize -= 3;
dataBuffer = (const void *)(bytesPtr + 3);
}
}
returnValue = (*env)->NewByteArray(env, dataSize);
if (returnValue == NULL) {
return NULL;
}
if (dataSize != 0) {
const void *dataBuffer = [clipData bytes];
(*env)->SetByteArrayRegion(env, returnValue, 0, dataSize, (jbyte *)dataBuffer);
}