Repository navigation
Commit 65ea54c
Fix heap-buffer-overflow and edge cases when parsing GMSH files.
1. Resource buffers are length-delimited, not null-terminated: FileToMemory
sizes its vector to the file length, and mj_addBufferVFS copies exactly the
bytes it is given. LoadGMSH handed such a buffer straight to sscanf, whose
internal scan ran off the end for any GMSH file with no NUL byte after
"$MeshFormat" -- that is, every ASCII .msh. Parse a bounded copy of the
version line instead. Under -fsanitize=address this aborted ~15 UserFlexTest
MSH cases, RecompileCompareTest and WriteReadCompareTest.
2. The "missing $Nodes" and "missing $Elements" checks tested nodebegin/elembegin
for -1 after the section name length had already been added to them, so they
were never true. Check for sections before offsetting past their names.
3. findstring stopped scanning at buffer_sz - len, one position short of the
last possible match, so a marker flush against the end of the buffer was
reported as absent. Scan up to buffer_sz - len.
4. Add regression tests for truncated headers, missing sections, and EOF markers.
PiperOrigin-RevId: 985075471
Change-Id: Ib62509d1d509d54014b49ce898345c43fe7ab6e71 parent dc8bb13 commit 65ea54c
3 files changed
Lines changed: 132 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
| 60 | + | |
| 61 | + | |
60 | 62 | | |
61 | 63 | | |
62 | 64 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1367 | 1367 | | |
1368 | 1368 | | |
1369 | 1369 | | |
1370 | | - | |
1371 | | - | |
| 1370 | + | |
| 1371 | + | |
1372 | 1372 | | |
1373 | 1373 | | |
1374 | 1374 | | |
| |||
1965 | 1965 | | |
1966 | 1966 | | |
1967 | 1967 | | |
1968 | | - | |
1969 | | - | |
1970 | | - | |
1971 | | - | |
1972 | | - | |
1973 | | - | |
| 1968 | + | |
| 1969 | + | |
| 1970 | + | |
| 1971 | + | |
| 1972 | + | |
| 1973 | + | |
| 1974 | + | |
1974 | 1975 | | |
1975 | 1976 | | |
1976 | 1977 | | |
| |||
1982 | 1983 | | |
1983 | 1984 | | |
1984 | 1985 | | |
| 1986 | + | |
| 1987 | + | |
| 1988 | + | |
| 1989 | + | |
1985 | 1990 | | |
1986 | 1991 | | |
1987 | 1992 | | |
1988 | 1993 | | |
1989 | | - | |
1990 | | - | |
| 1994 | + | |
1991 | 1995 | | |
1992 | | - | |
1993 | 1996 | | |
1994 | 1997 | | |
1995 | 1998 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| 18 | + | |
18 | 19 | | |
19 | 20 | | |
20 | 21 | | |
| |||
826 | 827 | | |
827 | 828 | | |
828 | 829 | | |
| 830 | + | |
| 831 | + | |
| 832 | + | |
| 833 | + | |
| 834 | + | |
| 835 | + | |
| 836 | + | |
| 837 | + | |
| 838 | + | |
| 839 | + | |
| 840 | + | |
| 841 | + | |
| 842 | + | |
| 843 | + | |
| 844 | + | |
| 845 | + | |
| 846 | + | |
| 847 | + | |
| 848 | + | |
| 849 | + | |
| 850 | + | |
| 851 | + | |
| 852 | + | |
| 853 | + | |
| 854 | + | |
| 855 | + | |
| 856 | + | |
| 857 | + | |
| 858 | + | |
| 859 | + | |
| 860 | + | |
| 861 | + | |
| 862 | + | |
| 863 | + | |
| 864 | + | |
| 865 | + | |
| 866 | + | |
| 867 | + | |
| 868 | + | |
| 869 | + | |
| 870 | + | |
| 871 | + | |
| 872 | + | |
| 873 | + | |
| 874 | + | |
| 875 | + | |
| 876 | + | |
| 877 | + | |
| 878 | + | |
| 879 | + | |
| 880 | + | |
| 881 | + | |
| 882 | + | |
| 883 | + | |
| 884 | + | |
| 885 | + | |
| 886 | + | |
| 887 | + | |
| 888 | + | |
| 889 | + | |
| 890 | + | |
| 891 | + | |
| 892 | + | |
| 893 | + | |
| 894 | + | |
| 895 | + | |
| 896 | + | |
| 897 | + | |
| 898 | + | |
| 899 | + | |
| 900 | + | |
| 901 | + | |
| 902 | + | |
| 903 | + | |
| 904 | + | |
| 905 | + | |
| 906 | + | |
| 907 | + | |
| 908 | + | |
| 909 | + | |
| 910 | + | |
| 911 | + | |
| 912 | + | |
| 913 | + | |
| 914 | + | |
| 915 | + | |
| 916 | + | |
| 917 | + | |
| 918 | + | |
| 919 | + | |
| 920 | + | |
| 921 | + | |
| 922 | + | |
| 923 | + | |
| 924 | + | |
| 925 | + | |
| 926 | + | |
| 927 | + | |
| 928 | + | |
| 929 | + | |
| 930 | + | |
| 931 | + | |
| 932 | + | |
| 933 | + | |
| 934 | + | |
| 935 | + | |
| 936 | + | |
| 937 | + | |
| 938 | + | |
| 939 | + | |
| 940 | + | |
| 941 | + | |
| 942 | + | |
| 943 | + | |
| 944 | + | |
829 | 945 | | |
830 | 946 | | |
831 | 947 | | |
| |||
0 commit comments