Commitf356d8b

committed

fix: do not crash DataChannelRereaders when empty file is encountered

1 parent433eaf3 commitf356d8bCopy full SHA for f356d8b

File tree

-5

lines changed

-5

lines changed

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -90,17 +90,18 @@ public String readString() {`
`90`	`90`	`// try to do the read`
`91`	`91`	`// only one try, as:`
`92`	`92`	`// - value >0 indicates success`
`93`		`-// - value =0does not tell us much, as there's a possibility of reading anempty attribute`
`94`		`-// - value <0 indicatesfailure`
	`93`	`+// - value =0indicatesempty attribute (???)`
	`94`	`+// - value <0 indicatesempty attribute`
`95`	`95`	`intn =channel.read(buffer,0);`
`96`		`-if (n == -1) {`
`97`		`-thrownewIOException("Premature end of file " +path);`
	`96`	`+// minus one reliably occurs on empty file, zero should be similar`
	`97`	`+if (n <=0) {`
	`98`	`+return"";`
`98`	`99`	`}`
`99`	`100`
`100`	`101`	`// strip trailing newline & return data as a string`
`101`	`102`	`// rationale: ev3dev sysfs often appends \n, but this breaks parseFloat/parseInt/...`
`102`	`103`	`byte[]bytes =buffer.array();`
`103`		`-if (n >0 &&bytes[n -1] =='\n') {`
	`104`	`+if (bytes[n -1] =='\n') {`
`104`	`105`	`returnnewString(bytes,0,n -1,StandardCharsets.UTF_8);`
`105`	`106`	`}else {`
`106`	`107`	`returnnewString(bytes,0,n,StandardCharsets.UTF_8);`

Comments

(0)