change jl_get_field_offset to test validity of and return the specified field offset

vtjnash · vtjnash · commit 30a44c9124e7 · 2016-01-21T17:44:57.000-05:00
diff --git a/src/sys.c b/src/sys.c
@@ -631,9 +631,9 @@ JL_DLLEXPORT long jl_SC_CLK_TCK(void)
 
 JL_DLLEXPORT size_t jl_get_field_offset(jl_datatype_t *ty, int field)
 {
-    if (field > jl_datatype_nfields(ty))
+    if (field > jl_datatype_nfields(ty) || field < 1)
         jl_error("This type does not have that many fields");
-    return jl_field_offset(ty, field);
+    return jl_field_offset(ty, field-1);
 }
 
 JL_DLLEXPORT size_t jl_get_alignment(jl_datatype_t *ty)

Original file line number	Diff line number	Diff line change
`@@ -631,9 +631,9 @@ JL_DLLEXPORT long jl_SC_CLK_TCK(void)`
`631`	`631`
`632`	`632`	`JL_DLLEXPORT size_t jl_get_field_offset(jl_datatype_t *ty, int field)`
`633`	`633`	`{`
`634`		`- if (field > jl_datatype_nfields(ty))`
	`634`	`+ if (field > jl_datatype_nfields(ty) \|\| field < 1)`
`635`	`635`	`jl_error("This type does not have that many fields");`
`636`		`- return jl_field_offset(ty, field);`
	`636`	`+ return jl_field_offset(ty, field-1);`
`637`	`637`	`}`
`638`	`638`
`639`	`639`	`JL_DLLEXPORT size_t jl_get_alignment(jl_datatype_t *ty)`