Don't allow invalid project files! #2523

zonkmachine · 2016-01-28T06:32:25Z

The renderer hangs bad if you give it something that isn't an LMMS project as argument.


Loading project...
Done
|-                                 |      0%   \   <---infinite hang here!

This fix tests that the given file is really a file ( not a directory ). It also tests for a valid LMMS project suffix.

~/builds/lmms/build$ ./lmms -r ../build
The file ../build does not exist!

You can test specifically for if the argument is a directory and report accordingly but that would be over doing it a bit I think.

~/builds/lmms/build$ ./lmms -r ../build/lmmscon
The file ../build/lmmscon does not exist!

~/builds/lmms/build$ ./lmms -r ../build/lmmsconfig.h 
../build/lmmsconfig.h is not an LMMS project fil

I finally moved the line Engine::init( true ); to after the tests as it just felt like a better place.

tresf · 2016-01-28T18:29:37Z

Looks good. 👍 I'll leave time for comments. One thought was the posiblity of loading a non-mmp or non-mmpz file, but loadFile only takes projects, so that's for another time. 👍

zonkmachine · 2016-01-28T20:06:54Z

One thought was the posiblity of loading a non-mmp or non-mmpz file,

Yes, I was going to ask about it.
I'm currently trying to move the whole file test to here. Right after fileToLoad is assigned a file.
We're currently treating file arguments for render and load differently and this should fix it. It works but I haven't tested it thoroughly. It probably makes the larger part of #2524 redundant

zonkmachine · 2016-01-29T05:45:20Z

In the last version it still tests for an empty fileToLoad if you choose --import and halts with a
The file does not exist!

zonkmachine · 2016-01-29T10:12:35Z

Same checks for files to import.

zonkmachine · 2016-01-29T10:40:30Z

One thought was the posiblity of loading a non-mmp or non-mmpz file

An mpt file?

softrabbit · 2016-01-30T18:50:21Z

An mpt file?

Any valid LMMS project file that happens to be named differently from what's expected? If I explicitly tell LMMS to load a file called "myproject.mmpx" or whatever, I expect it to at least try and not reject the file until it's at least opened the file and tried parsing it.

zonkmachine · 2016-02-07T21:20:30Z

Any valid LMMS project file that happens to be named differently from what's expected? If I explicitly tell LMMS to load a file called "myproject.mmpx" or whatever, I expect it to at least try and not reject the file until it's at least opened the file and tried parsing it.

OK. Right now if you try and save a project file with another suffix than .mmp or .mmpz, it will stick a new suffix after the one you opted for. In your case with myproject.mmpx you will get myproject.mmpx.mmpz so on my Ubuntu/Mint I have to go back and change suffix manually and then myproject.mmpx will open as you expect it. ~~Either as a command line argument or from the gui~~.

Edit: Only files ending mmp/mmpz will show up in the file open dialogue so other valid projects will have to be loaded from the command line.

tresf · 2016-04-23T17:41:27Z

src/core/main.cpp

+					fileInfoImport.suffix().toLower() == "midi"	||
+					fileInfoImport.suffix().toLower() == "rmi"	||
+					fileInfoImport.suffix().toLower() == "flp"	||
+					fileInfoImport.suffix().toLower() == "h2song" ) )


Hmm.... Every time I see a laundry list of file extensions I get worried that we're making more work for ourselves down the road. 😄 Perhaps related to this PR, perhaps not.... can we start managing our extension in a centralized place? We should be able to use #ifdef's to enable/disable them globally based on what libraries/plugins cmake finds. We already do this in several other places already. Food for thought.

Perhaps related to this PR, perhaps not.... can we start managing our extension in a centralized place?

Related but it doesn't sound like something I can implement.

zonkmachine · 2016-05-05T00:45:14Z

Conflicts resolved.

Umcaruje · 2016-07-08T16:34:19Z

@zonkmachine is there any more work needed to be done here, or it could be tested and merged?

zonkmachine · 2016-07-08T21:04:12Z

Yes, mad sorry about the slow response here. Short on time. I'll look into it as soon as I possibly can.

zonkmachine · 2016-07-10T23:20:44Z

OK. Trying to finish this one now.

jasp00 · 2016-07-18T19:58:43Z

src/core/main.cpp

+		}
+		else if( !(	fileInfoLoad.suffix().toLower() == "mmp" ||
+				fileInfoLoad.suffix().toLower() == "mmpz" ||
+				fileInfoLoad.suffix().toLower() == "mpt" ) )


Older projects use the xml extension.

jasp00 · 2016-07-21T16:45:04Z

Current fix is incomplete. Input file could be an empty file, the empty template, a broken project or a different XML file. I do not think these new checks are necessary. The check for empty projects on export should be enough.

jasp00 · 2016-07-21T16:46:43Z

I do not think these new checks are necessary.

I mean checking the extension, if the input does not exists, etc.

zonkmachine · 2016-08-09T15:41:15Z

Right, back on this...

Input file could be an empty file,

Hm, missed that. Poking around with it right now...

the empty template

...Will open correctly.

a broken project

A file that is empty or a broken project will be passed to LMMS who will fail to open it and report on it.

It will then open an empty project with the title of the project you tried to open.

jasp00 · 2016-08-09T22:44:12Z

I mean that rendering those invalid projects (empty file, empty template, etc.) with lmms -r causes the infinite hang.

zonkmachine · 2016-08-09T23:43:02Z

Right. In the case of an empty file the latest commit proposed a fix and it's working. An empty template however, I think goes a bit beyond this PR. Shouldn't it rather be catched by the renderer?

zonkmachine · 2016-08-11T10:17:01Z

When exporting from the gui lmms ran TrackContainer::isEmpty() so I added this test in main.


$ ./lmms --rendertracks empty.mmpz
Notice: could not set realtime priority.
VST sync support disabled in your configuration
Loading project...
The project empty.mmpz is empty, aborting!

jasp00 · 2016-08-17T02:22:16Z

src/core/main.cpp

+		else if( !(	fileInfoLoad.suffix().toLower() == "mmp" ||
+				fileInfoLoad.suffix().toLower() == "mmpz" ||
+				fileInfoLoad.suffix().toLower() == "mpt" ||
+				fileInfoLoad.suffix().toLower() == "xml" ) )


Having one of these extensions is not required; this check should be removed. The Engine::getSong()->isEmpty() check takes care of invalid projects.

OK. I initially made these suffix tests because lmms opens in an unclean manner when you throw a file whatever at it. It will open a blank project with the title you just gave it. I think at least we should not set the project title when the project couldn't be opened.

It will open a blank project with the title you just gave it. I think at least we should not set the project title when the project couldn't be opened.

That's a regression from 1.1.3 which does this just fine...

zonkmachine · 2016-09-01T17:41:45Z

src/core/main.cpp

+	{
+		fileCheck( fileToLoad );
+	}
+	if( !fileToImport.isEmpty() )


else if

Should I short this one out and give fileToLoad priority?

Yeah, fixed that...

zonkmachine · 2016-09-01T21:32:14Z

src/core/main.cpp

+		{
+			printf("The project %s is empty, aborting!\n", fileToLoad.toUtf8().constData() );
+			exit( EXIT_FAILURE );
+		}


Is exit() even a good way to terminate the application at this point?

You may omit exit() and avoid the export, so an upgraded .lmmsrc.xml can be written, but exit() (or return) is not a bad way.

oK. I just skimmed past some comment on the net that exit() could be a problem with multi threaded applications. I'm happy with .lmmsrc.xml not being written so we keep failing loads from appearing in the recently opened projects list.

zonkmachine · 2016-09-02T03:08:14Z

lmms used to load default.mmp on failing to load a project but this was broken in commit: 2c7036e#diff-1c0d925f7437a8e3a837c0a991b4cf34

I'll try and look into the original issue (Edit: #781) behind that PR

Edit2: Fix for this in #3013

zonkmachine · 2016-09-02T03:35:50Z

It's better to not inflate this PR. The regression in Song.cpp is not directly related to these fixes so I'll treat them separately.

Rebased and squashed! 🚜

jasp00 · 2016-09-04T19:41:57Z

This request may be merged.

zonkmachine · 2016-09-05T10:17:44Z

🚜

* master: (213 commits) Update Pattern and AutomationPattern length (LMMS#3037) Refresh i18n strings Hint text update Drop notes with length zero (LMMS#3031) Background tweak Background Update Flanger Exclude .ts files from the Github linguist Redesign Multitap echo (LMMS#3008) Update i18n source strings Extended arpeggiator functions (LMMS#2130) Fix sample track playback in BB tracks (LMMS#3023) Sort plug-in embedded resources (LMMS#3014) Implement version major.minor.release-stage.build (LMMS#3011) Fix regressions on loading broken projects (LMMS#3013) Improved file input validation. (LMMS#2523) Fix sample track view in BB editor (LMMS#3002) Request change in model when dropping a track (LMMS#3000) Add LocklessAllocator and use it in LocklessList (LMMS#2998) Drop forceStep in AutomatableModel (LMMS#3010) ...

zonkmachine added the bug label Jan 28, 2016

zonkmachine added this to the 1.2.0 milestone Jan 28, 2016

zonkmachine changed the title ~~Don't allow crap as render argument!~~ Don't allow invalid arguments to the renderer! Jan 28, 2016

zonkmachine changed the title ~~Don't allow invalid arguments to the renderer!~~ Don't allow invalid project file arguments! Jan 29, 2016

zonkmachine changed the title ~~Don't allow invalid project file arguments!~~ Don't allow invalid project files! Jan 29, 2016

zonkmachine force-pushed the directoryargument branch from 2e8aaaa to 469117d Compare January 29, 2016 10:35

zonkmachine force-pushed the directoryargument branch from 469117d to 9600c50 Compare February 13, 2016 17:58

tresf reviewed Apr 23, 2016
View reviewed changes

zonkmachine force-pushed the directoryargument branch from 9600c50 to 4a3fca6 Compare May 5, 2016 00:37

zonkmachine force-pushed the directoryargument branch from 4a3fca6 to 080119c Compare May 5, 2016 21:27

zonkmachine force-pushed the directoryargument branch 2 times, most recently from 94d106a to 2bcda0e Compare July 18, 2016 06:07

jasp00 reviewed Jul 18, 2016
View reviewed changes

zonkmachine force-pushed the directoryargument branch from fcdf23a to b437266 Compare August 9, 2016 16:42

jasp00 reviewed Aug 17, 2016
View reviewed changes

zonkmachine force-pushed the directoryargument branch 2 times, most recently from 9e0cccc to d06f253 Compare September 1, 2016 17:38

zonkmachine reviewed Sep 1, 2016
View reviewed changes

zonkmachine force-pushed the directoryargument branch from d06f253 to 5e5c88a Compare September 1, 2016 17:52

Improved file input validation.

0039460

zonkmachine force-pushed the directoryargument branch from 5e5c88a to 0039460 Compare September 1, 2016 19:08

zonkmachine reviewed Sep 1, 2016
View reviewed changes

zonkmachine merged commit a53fd26 into LMMS:master Sep 5, 2016

zonkmachine deleted the directoryargument branch September 5, 2016 14:02

sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022

Improved file input validation. (LMMS#2523)

5942b64

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Don't allow invalid project files! #2523

Don't allow invalid project files! #2523

zonkmachine commented Jan 28, 2016

tresf commented Jan 28, 2016

zonkmachine commented Jan 28, 2016

zonkmachine commented Jan 29, 2016

zonkmachine commented Jan 29, 2016

zonkmachine commented Jan 29, 2016

softrabbit commented Jan 30, 2016

zonkmachine commented Feb 7, 2016

tresf Apr 23, 2016

zonkmachine May 5, 2016

zonkmachine commented May 5, 2016

Umcaruje commented Jul 8, 2016

zonkmachine commented Jul 8, 2016

zonkmachine commented Jul 10, 2016

jasp00 Jul 18, 2016

zonkmachine Jul 19, 2016

jasp00 commented Jul 21, 2016

jasp00 commented Jul 21, 2016

zonkmachine commented Aug 9, 2016 •

edited

Loading

jasp00 commented Aug 9, 2016

zonkmachine commented Aug 9, 2016

zonkmachine commented Aug 11, 2016

jasp00 Aug 17, 2016

zonkmachine Sep 1, 2016

zonkmachine Sep 1, 2016

zonkmachine Sep 1, 2016 •

edited

Loading

zonkmachine Sep 1, 2016

zonkmachine Sep 1, 2016

jasp00 Sep 4, 2016

zonkmachine Sep 5, 2016

zonkmachine commented Sep 2, 2016 •

edited

Loading

zonkmachine commented Sep 2, 2016

jasp00 commented Sep 4, 2016

zonkmachine commented Sep 5, 2016

Don't allow invalid project files! #2523

Don't allow invalid project files! #2523

Conversation

zonkmachine commented Jan 28, 2016

tresf commented Jan 28, 2016

zonkmachine commented Jan 28, 2016

zonkmachine commented Jan 29, 2016

zonkmachine commented Jan 29, 2016

zonkmachine commented Jan 29, 2016

softrabbit commented Jan 30, 2016

zonkmachine commented Feb 7, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zonkmachine commented May 5, 2016

Umcaruje commented Jul 8, 2016

zonkmachine commented Jul 8, 2016

zonkmachine commented Jul 10, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jasp00 commented Jul 21, 2016

jasp00 commented Jul 21, 2016

zonkmachine commented Aug 9, 2016 • edited Loading

jasp00 commented Aug 9, 2016

zonkmachine commented Aug 9, 2016

zonkmachine commented Aug 11, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zonkmachine Sep 1, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zonkmachine commented Sep 2, 2016 • edited Loading

zonkmachine commented Sep 2, 2016

jasp00 commented Sep 4, 2016

zonkmachine commented Sep 5, 2016

zonkmachine commented Aug 9, 2016 •

edited

Loading

zonkmachine Sep 1, 2016 •

edited

Loading

zonkmachine commented Sep 2, 2016 •

edited

Loading