Merge branch 'bugfix-MemoryLeak_in_persist_read' of git://github.com/panava/mosquitto into panava-bugfix-MemoryLeak_in_persist_read
This commit is contained in:
commit
3220790790
@ -4,12 +4,12 @@ Copyright (c) 2010-2018 Roger Light <roger@atchoo.org>
|
||||
All rights reserved. This program and the accompanying materials
|
||||
are made available under the terms of the Eclipse Public License v1.0
|
||||
and Eclipse Distribution License v1.0 which accompany this distribution.
|
||||
|
||||
|
||||
The Eclipse Public License is available at
|
||||
http://www.eclipse.org/legal/epl-v10.html
|
||||
and the Eclipse Distribution License is available at
|
||||
http://www.eclipse.org/org/documents/edl-v10.php.
|
||||
|
||||
|
||||
Contributors:
|
||||
Roger Light - initial implementation and documentation.
|
||||
*/
|
||||
@ -432,10 +432,12 @@ int persist__restore(struct mosquitto_db *db)
|
||||
case DB_CHUNK_CFG:
|
||||
if(db_version == 5){
|
||||
if(persist__chunk_cfg_read_v5(fptr, &cfg_chunk)){
|
||||
fclose(fptr);
|
||||
return 1;
|
||||
}
|
||||
}else{
|
||||
if(persist__chunk_cfg_read_v234(fptr, &cfg_chunk)){
|
||||
fclose(fptr);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user