@@ -1235,7 +1235,11 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
1235
1235
}
1236
1236
}
1237
1237
if ( funcStr . includes ( "/" ) ) {
1238
- funcStr = "<func>" ;
1238
+ funcStr = "<funcForwardSlash>" ;
1239
+ } else if ( funcStr . includes ( "\\" ) ) {
1240
+ funcStr = "<funcBackSlash>" ;
1241
+ } else if ( funcStr . includes ( "@" ) ) {
1242
+ funcStr = "<funcAt>" ;
1239
1243
} else if ( ! validFrameFound && ( funcStr . startsWith ( "crash_handler(" ) || funcStr . startsWith ( "_sigtramp" ) ) ) {
1240
1244
continue ; // Skip these on early frames.
1241
1245
}
@@ -1246,8 +1250,10 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
1246
1250
const offsetPos2 : number = offsetPos + offsetStr . length ;
1247
1251
if ( isMac ) {
1248
1252
const pendingOffset : string = line . substring ( offsetPos2 ) ;
1249
- if ( ! pendingOffset . includes ( "/" ) ) {
1253
+ if ( ! pendingOffset . includes ( "/" ) && ! pendingOffset . includes ( "\\" ) && ! pendingOffset . includes ( "@" ) ) {
1250
1254
crashCallStack += pendingOffset ;
1255
+ } else {
1256
+ crashCallStack += "<offsetUnexpectedCharacter>" ;
1251
1257
}
1252
1258
const startAddressPos : number = line . indexOf ( "0x" ) ;
1253
1259
if ( startAddressPos === - 1 || startAddressPos >= startPos ) {
@@ -1263,8 +1269,10 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
1263
1269
continue ; // unexpected
1264
1270
}
1265
1271
const pendingOffset : string = line . substring ( offsetPos2 , endPos ) ;
1266
- if ( ! pendingOffset . includes ( "/" ) ) {
1272
+ if ( ! pendingOffset . includes ( "/" ) && ! pendingOffset . includes ( "\\" ) && ! pendingOffset . includes ( "@" ) ) {
1267
1273
crashCallStack += pendingOffset ;
1274
+ } else {
1275
+ crashCallStack += "<offsetUnexpectedCharacter>" ;
1268
1276
}
1269
1277
}
1270
1278
}
@@ -1285,6 +1293,10 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
1285
1293
data = data . substring ( 0 , 8191 ) + "…" ;
1286
1294
}
1287
1295
1296
+ if ( addressData . includes ( "/" ) || addressData . includes ( "\\" ) || addressData . includes ( "@" ) ) {
1297
+ addressData = "<addressDataUnexpectedCharacter>" ;
1298
+ }
1299
+
1288
1300
logCppCrashTelemetry ( data , addressData ) ;
1289
1301
1290
1302
await util . deleteFile ( path . resolve ( crashDirectory , crashFile ) ) . catch ( logAndReturn . undefined ) ;
0 commit comments