mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

mysql: fix unwrapped unsafe code of mysql lib (#6680). (#6681)

Browse Source
This commit is contained in:
Rolf Schmidt
2020-10-26 10:21:28 +01:00
committed by GitHub
parent 8e478e8909
commit 3f5be0f4fc
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vlib/mysql/result.v
View File

@ -31,10 +31,10 @@ pub fn (r Result) rows() []Row {
for rr := r.fetch_row(); rr; rr = r.fetch_row() {
mut row := Row{}
for i in 0 .. nr_cols {
if rr[i] == 0 {
if unsafe {rr[i] == 0} {
row.vals << ''
} else {
row.vals << mystring(byteptr(rr[i]))
row.vals << mystring(unsafe {byteptr(rr[i])})
}
}
rows << row
@ -63,7 +63,7 @@ pub fn (r Result) fields() []Field {
nr_cols := r.n_fields()
orig_fields := C.mysql_fetch_fields(r.result)
for i in 0 .. nr_cols {
fields << Field{
unsafe {fields << Field{
name: mystring(orig_fields[i].name)
org_name: mystring(orig_fields[i].org_name)
table: mystring(orig_fields[i].table)
@ -84,7 +84,7 @@ pub fn (r Result) fields() []Field {
decimals: orig_fields.decimals
charsetnr: orig_fields.charsetnr
type_: FieldType(orig_fields.@type)
}
}}
}
return fields
}