Skip to content

Commit

Permalink
strange address sanitizer problem in second round of tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Rezia23 committed Jun 11, 2021
1 parent e529d78 commit 89034e7
Showing 1 changed file with 21 additions and 2 deletions.
23 changes: 21 additions & 2 deletions 3/solution.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,16 @@ struct openFileEntry{
class CFileSystem {
public:
CFileSystem(TBlkDev oldDev) : dev((oldDev)){
metadata = new char [sizeOfMetaData];
metadata = new char [numSectorsForMetadata*SECTOR_SIZE];
memset(metadata, 0, numSectorsForMetadata*SECTOR_SIZE);
dev.m_Read(0, metadata, numSectorsForMetadata);
printf("rozbije se to uz tady\n");
FileMetaData fmd = getFileMetaDataAtIndex(0);
if(fmd.valid){
printf("valid");
}else{
printf("invalid");
}
}

static bool CreateFs(const TBlkDev &dev);
Expand All @@ -112,7 +120,15 @@ class CFileSystem {
CloseFile(i);
}
}
dev.m_Write(0, metadata, sizeOfMetaData);

FileMetaData fmdOrigin = getFileMetaDataAtIndex(0);

dev.m_Write(0, metadata, numSectorsForMetadata);

//debug
dev.m_Read(0, metadata, numSectorsForMetadata);
FileMetaData fmdNew = getFileMetaDataAtIndex(0);

delete [] metadata;
return true;
}
Expand Down Expand Up @@ -227,6 +243,8 @@ bool CFileSystem::DeleteFile(const char *fileName){

FileMetaData CFileSystem::getFileMetaDataAtIndex(int it){
FileMetaData fmd;
printf("index is %d\n", it);
printf("fmd offset is %d \n", getFileMetaDataOffset(0));
memcpy(&fmd, metadata + getFileMetaDataOffset(it), sizeof(FileMetaData));
return fmd;
}
Expand Down Expand Up @@ -505,6 +523,7 @@ size_t CFileSystem::WriteFile(int fd, const void *data, size_t len){
char sector[SECTOR_SIZE];
size_t writePointer = 0;
for(size_t i = 0; i<numNeededSectors;i++){
//printf("Writing to sector %zu \n", neededSectors[i]);
if(numNeededSectors == 1 && openFiles[fd].offset%SECTOR_SIZE != 0){
dev.m_Read(neededSectors[i], sector, 1);
memcpy(sector + openFiles[fd].offset%SECTOR_SIZE, dataC, len);
Expand Down

0 comments on commit 89034e7

Please sign in to comment.