Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
glslang
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
glslang
Commits
bce1f510
Commit
bce1f510
authored
Feb 18, 2019
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Build: Fix #1640: Change strcpy to snprintf.
parent
9f538c72
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
Pp.cpp
glslang/MachineIndependent/preprocessor/Pp.cpp
+1
-2
PpScanner.cpp
glslang/MachineIndependent/preprocessor/PpScanner.cpp
+5
-4
No files found.
glslang/MachineIndependent/preprocessor/Pp.cpp
View file @
bce1f510
...
@@ -866,8 +866,7 @@ int TPpContext::CPPextension(TPpToken* ppToken)
...
@@ -866,8 +866,7 @@ int TPpContext::CPPextension(TPpToken* ppToken)
if
(
token
!=
PpAtomIdentifier
)
if
(
token
!=
PpAtomIdentifier
)
parseContext
.
ppError
(
ppToken
->
loc
,
"extension name expected"
,
"#extension"
,
""
);
parseContext
.
ppError
(
ppToken
->
loc
,
"extension name expected"
,
"#extension"
,
""
);
assert
(
strlen
(
ppToken
->
name
)
<=
MaxTokenLength
);
snprintf
(
extensionName
,
sizeof
(
extensionName
),
"%s"
,
ppToken
->
name
);
strcpy
(
extensionName
,
ppToken
->
name
);
token
=
scanToken
(
ppToken
);
token
=
scanToken
(
ppToken
);
if
(
token
!=
':'
)
{
if
(
token
!=
':'
)
{
...
...
glslang/MachineIndependent/preprocessor/PpScanner.cpp
View file @
bce1f510
...
@@ -1116,7 +1116,7 @@ int TPpContext::tokenize(TPpToken& ppToken)
...
@@ -1116,7 +1116,7 @@ int TPpContext::tokenize(TPpToken& ppToken)
parseContext
.
ppError
(
ppToken
.
loc
,
"character literals not supported"
,
"
\'
"
,
""
);
parseContext
.
ppError
(
ppToken
.
loc
,
"character literals not supported"
,
"
\'
"
,
""
);
continue
;
continue
;
default
:
default
:
s
trcpy
(
ppToken
.
name
,
atomStrings
.
getString
(
token
));
s
nprintf
(
ppToken
.
name
,
sizeof
(
ppToken
.
name
),
"%s"
,
atomStrings
.
getString
(
token
));
break
;
break
;
}
}
...
@@ -1185,8 +1185,8 @@ int TPpContext::tokenPaste(int token, TPpToken& ppToken)
...
@@ -1185,8 +1185,8 @@ int TPpContext::tokenPaste(int token, TPpToken& ppToken)
case
PpAtomAnd
:
case
PpAtomAnd
:
case
PpAtomOr
:
case
PpAtomOr
:
case
PpAtomXor
:
case
PpAtomXor
:
s
trcpy
(
ppToken
.
name
,
atomStrings
.
getString
(
resultToken
));
s
nprintf
(
ppToken
.
name
,
sizeof
(
ppToken
.
name
),
"%s"
,
atomStrings
.
getString
(
resultToken
));
s
trcpy
(
pastedPpToken
.
name
,
atomStrings
.
getString
(
token
));
s
nprintf
(
pastedPpToken
.
name
,
sizeof
(
pastedPpToken
.
name
),
"%s"
,
atomStrings
.
getString
(
token
));
break
;
break
;
default
:
default
:
parseContext
.
ppError
(
ppToken
.
loc
,
"not supported for these tokens"
,
"##"
,
""
);
parseContext
.
ppError
(
ppToken
.
loc
,
"not supported for these tokens"
,
"##"
,
""
);
...
@@ -1198,7 +1198,8 @@ int TPpContext::tokenPaste(int token, TPpToken& ppToken)
...
@@ -1198,7 +1198,8 @@ int TPpContext::tokenPaste(int token, TPpToken& ppToken)
parseContext
.
ppError
(
ppToken
.
loc
,
"combined tokens are too long"
,
"##"
,
""
);
parseContext
.
ppError
(
ppToken
.
loc
,
"combined tokens are too long"
,
"##"
,
""
);
return
resultToken
;
return
resultToken
;
}
}
strncat
(
ppToken
.
name
,
pastedPpToken
.
name
,
MaxTokenLength
-
strlen
(
ppToken
.
name
));
snprintf
(
&
ppToken
.
name
[
0
]
+
strlen
(
ppToken
.
name
),
sizeof
(
ppToken
.
name
)
-
strlen
(
ppToken
.
name
),
"%s"
,
pastedPpToken
.
name
);
// correct the kind of token we are making, if needed (identifiers stay identifiers)
// correct the kind of token we are making, if needed (identifiers stay identifiers)
if
(
resultToken
!=
PpAtomIdentifier
)
{
if
(
resultToken
!=
PpAtomIdentifier
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment